Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Junio C Hamano
Johannes Sixt writes: > The idea of marking git-gui and gitk histories that none of their > commits is checked out: it erases all Git source code from the working > directory, and a later bisection step places all code back and it > requires a full build. Not a big deal with Git, but there are mu

Re: [PATCH] test-lib: abort when can't remove trash directory

2017-04-24 Thread Junio C Hamano
Jeff King writes: > Sort of. It still has the bug that it dies with error() when "--debug" > is used. Ah, I forgot about that one. Let me squash it in without the remove_trash change then, perhaps, but not today.

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

2017-04-24 Thread Junio C Hamano
Liam Beguin writes: > Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` > to abbreviate the command-names in the instruction list. > > This means that `git rebase -i` would print: > p deadbee The oneline of this commit > ... > > instead of: > pick deadbee The o

Re: [PATCH] test-lib: abort when can't remove trash directory

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 11:05:15PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Good point. There's only one caller, but it does care about being in > > that directory. > > > >> Second try that hopefully is much less damaging > > I've been carrying it as a SQUASH??? patch, but I think

Re: [PATCH] test-lib: abort when can't remove trash directory

2017-04-24 Thread Junio C Hamano
Jeff King writes: > Good point. There's only one caller, but it does care about being in > that directory. > >> Second try that hopefully is much less damaging I've been carrying it as a SQUASH??? patch, but I think it is better to split it as a separate pach, as removal of $remove_trash is an o

Re: [PATCH v5 4/8] Specify explicitly where we parse timestamps

2017-04-24 Thread Junio C Hamano
oJohannes Schindelin writes: > diff --git a/pretty.c b/pretty.c > index d0f86f5d85c..24fb0c79062 100644 > --- a/pretty.c > +++ b/pretty.c > @@ -409,7 +409,7 @@ const char *show_ident_date(const struct ident_split > *ident, > long tz = 0; > > if (ident->date_begin && ident->date_end

Re: [PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 10:33:11PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Anyway. I don't think Miguel's patch needs to solve all of the lingering > > rename cases. But I am curious whether it makes some rename cases worse, > > because the depth-sorting was kicking in before and

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Johannes Sixt
Am 25.04.2017 um 04:00 schrieb Christian Couder: On Sat, Apr 22, 2017 at 3:37 PM, Johannes Sixt wrote: Am 21.04.2017 um 14:29 schrieb Christian Couder: First bisect should ask you to test merge bases only if there are "good" commits that are not ancestors of the "bad" commit. That's a tang

Re: [PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Junio C Hamano
Jeff King writes: > Anyway. I don't think Miguel's patch needs to solve all of the lingering > rename cases. But I am curious whether it makes some rename cases worse, > because the depth-sorting was kicking in before and making them work. I agree with you on both counts, and I care more about t

Re: [PATCH v3 5/5] archive-zip: support files bigger than 4GB

2017-04-24 Thread René Scharfe
Am 25.04.2017 um 06:46 schrieb Junio C Hamano: René Scharfe writes: diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index 0ac94b5cc9..a6875dfdb1 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -178,7 +178,7 @@ test_expect_suc

Re: [PATCH v3 2/5] archive-zip: use strbuf for ZIP directory

2017-04-24 Thread René Scharfe
Am 25.04.2017 um 06:51 schrieb Junio C Hamano: René Scharfe writes: Keep the ZIP central director, which is written after all archive Is this typoed "directorY"? I know there was discussion on the correct terminology I only skimmed and I am too lazy to go back there to understand it to answ

Re: [PATCH v3 2/5] archive-zip: use strbuf for ZIP directory

2017-04-24 Thread Junio C Hamano
René Scharfe writes: > Keep the ZIP central director, which is written after all archive Is this typoed "directorY"? I know there was discussion on the correct terminology I only skimmed and I am too lazy to go back there to understand it to answer this question myself, so... > -#define ZIP_DI

Re: [PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 09:24:59PM -0700, Junio C Hamano wrote: > > So we sort deletions first. And the bit that the context doesn't quite > > show here is that we then compare renames and push them to the end. > > Everything else will compare equal. > > Wait--we also allow renames? Rename is li

Re: [PATCH v3 5/5] archive-zip: support files bigger than 4GB

2017-04-24 Thread Junio C Hamano
René Scharfe writes: > diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh > index 0ac94b5cc9..a6875dfdb1 100755 > --- a/t/t5004-archive-corner-cases.sh > +++ b/t/t5004-archive-corner-cases.sh > @@ -178,7 +178,7 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger

[PATCH v2] rebase -i: add config to abbreviate command-names

2017-04-24 Thread Liam Beguin
Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` to abbreviate the command-names in the instruction list. This means that `git rebase -i` would print: p deadbee The oneline of this commit ... instead of: pick deadbee The oneline of this commit ... Using a

[PATCH v2] rebase -i: add config to abbreviate command-names

2017-04-24 Thread Liam Beguin
Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` to abbreviate the command-names in the instruction list. This means that `git rebase -i` would print: p deadbee The oneline of this commit ... instead of: pick deadbee The oneline of this commit ... Using a

Re: [PATCH v5 0/6] Kill manual ref parsing code in worktree.c

2017-04-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > v5 chanes are mostly cosmetic: Good changes. Will re-queue. Thanks. > > diff --git a/refs.c b/refs.c > index 5d31fb6bcf..7972720256 100644 > --- a/refs.c > +++ b/refs.c > @@ -1530,11 +1530,7 @@ struct ref_store *get_main_ref_store(void) > if (main_ref_sto

Re: [PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Junio C Hamano
Jeff King writes: > Perhaps we would want a test for the case you are fixing (to be sure it > is not re-broken), as well as confirming that we have not re-broken the > original case (it looks like 060df62 added a test, so we may be OK with > that). Good suggestion. > >> +/* >> + * Compares two

Re: [PATCH] tests: fix tests broken under GETTEXT_POISON=YesPlease

2017-04-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > My general approach when writing & maintaining this poison has been > that it's fine if we skip some tests, even though we could be bending > over backwards to run them, or even if we don't know the root cause > beyond "the rebase machinery is always broken with

Re: [PATCH v4 8/9] Use uintmax_t for timestamps

2017-04-24 Thread Junio C Hamano
Johannes Schindelin writes: >> Should we at least clamp in date_overflows() so that large values >> representable with timestamp_t that will become unrepresentable when >> we start allowing negative timestamps would be rejected? That way >> we won't have to hear complaints from the people who us

Re: [PATCH v4 7/9] Abort if the system time cannot handle one of our timestamps

2017-04-24 Thread Junio C Hamano
Johannes Schindelin writes: > The code would also be incorrect, as the `minutes` variable can be > negative, which the `unsigned_add_overflows()` macro cannot handle (it > would report very, very false positives, and it would hurt you more than > me because I live East of Greenwich). Yes and no.

Re: Submodule/contents conflict

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 11:22:42PM -0400, Jeff King wrote: > > > It also has a similarity to > > > https://public-inbox.org/git/1492287435.14812.2.ca...@gmail.com/ > > > regarding > > > how checkout operates. > > I didn't look too deeply into this one, but it really looks like > somebody caring

Re: [PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Jeff King
On Tue, Apr 25, 2017 at 02:12:16AM +0200, Miguel Torroja wrote: > The delete operations of the fast-export output should precede any addition > belonging to the same commit, Addition and deletion with the same name > entry could happen in case of file to directory and viceversa. > > The fast-expo

Re: Submodule/contents conflict

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 04:43:28PM -0700, Stefan Beller wrote: > >> On the main list thare is a similar "issue" [1] regarding the expectation > >> for `git checkout`, > >> and importantly (for me) these collected views regarding the "Git Data > >> Protection and > >> Management Principles" is no

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Jonathan Nieder
(cc-ing the reporter) Brandon Williams wrote: > In some situations run-command will incorrectly try (and fail) to > execute a directory instead of an executable. For example: > > Lets suppose a user has PATH=~/bin (where 'bin' is a directory) and they > happen to have another directory inside 'bi

Re: [PATCH] rebase -i: add config to abbreviate command name

2017-04-24 Thread liam BEGUIN
Hi Johannes, On Mon, 2017-04-24 at 12:26 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 23 Apr 2017, Liam Beguin wrote: > > > Add the 'rebase.abbrevCmd' boolean config option to allow > > the user to abbreviate the default command name while editing > > the 'git-rebase-todo' file. > >

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 05:17:24PM -0700, Jonathan Nieder wrote: > > This is due to only checking 'access()' when locating an executable in > > PATH, which doesn't distinguish between files and directories. Instead > > use 'stat()' and check that the path is to a regular file. Now > > run-comman

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >> Until we switched from using execvp to execve, the symptom was very >> subtle: it only affected the error message when a program could not be >> found, instead of affecting functionality more substantially. > > Hmph, what if you had bin/ssh/ dire

Re: [PATCH v4 7/9] Abort if the system time cannot handle one of our timestamps

2017-04-24 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Sun, 23 Apr 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > diff --git a/date.c b/date.c >> > index 92ab31aa441..75f6335cd09 100644 >> > --- a/date.c >> > +++ b/date.c >> > @@ -46,7 +46,10 @@ static time_t gm_time_t(timestamp_t

Re: [PATCH] test-lib: abort when can't remove trash directory

2017-04-24 Thread Junio C Hamano
Torsten Bögershausen writes: > [] >>> >>> - cd "$(dirname "$remove_trash")" && >>> - rm -rf "$(basename "$remove_trash")" || >>> - error "Tests passed but test cleanup failed; aborting" >>> + cd "$(dirname "$TRASH_DIRECTORY")" && >>> +

Re: [PATCH v6 1/8] pkt-line: add packet_read_line_gently()

2017-04-24 Thread Junio C Hamano
Ben Peart writes: > On 4/24/2017 12:21 AM, Junio C Hamano wrote: >> Ben Peart writes: >> >>> Add packet_read_line_gently() to enable reading a line without dying on >>> EOF. >>> >>> Signed-off-by: Ben Peart >>> --- >>> pkt-line.c | 14 +- >>> pkt-line.h | 10 ++ >>> 2 fi

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Christian Couder
On Mon, Apr 24, 2017 at 6:34 PM, Philip Oakley wrote: > > Sorry if I'm bikeshedding here, but it does look like adding an alternate > 'bisect' strategy may be useful for this style of integration testing. > > To me, given the multiplicity of independent branches being brought > together, it should

Re: Submodule/contents conflict

2017-04-24 Thread Junio C Hamano
Stefan Beller writes: > A similar bug report > https://public-inbox.org/git/CAG0BQX=wvpkJ=pqwv-nbmhupv8yzvd_kykzjmsfwq9xstz2...@mail.gmail.com/ > > "checkout --recurse-submodules" (as mentioned in that report) > made it into Git by now, but this bug goes unfixed, still. I do not mind reverting t

Re: [PATCH v7] read-cache: force_verify_index_checksum

2017-04-24 Thread Junio C Hamano
Jeff Hostetler writes: >>> +test_expect_success 'detect corrupt index file in fsck' ' >>> +cp .git/index .git/index.backup && >>> +test_when_finished "mv .git/index.backup .git/index" && >>> +echo > && >>> +git add && >>> +sed -e "s///

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Christian Couder
On Sat, Apr 22, 2017 at 3:37 PM, Johannes Sixt wrote: > Am 21.04.2017 um 14:29 schrieb Christian Couder: >> >> First bisect should ask you to test merge bases only if there are >> "good" commits that are not ancestors of the "bad" commit. > > > That's a tangent, but I have never understood why thi

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Junio C Hamano
Jonathan Nieder writes: > Until we switched from using execvp to execve, the symptom was very > subtle: it only affected the error message when a program could not be > found, instead of affecting functionality more substantially. Hmph, what if you had bin/ssh/ directory and bin2/ssh executable

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Junio C Hamano
Brandon Williams writes: > This is due to only checking 'access()' when locating an executable in > PATH, which doesn't distinguish between files and directories. Instead > use 'stat()' and check that the path is to a regular file. Now > run-command won't try to execute the directory 'git-remot

Re: [PATCH] Documentation/git-checkout: make doc. of checkout clearer

2017-04-24 Thread Junio C Hamano
Christoph Michelbach writes: > I'm sorry, somehow my email client deleted half of your message when I saved > it > when replying. I only noticed this when wanting to delete your email and > noticed > that it was pretty long. Please separate your discussion from the patch proper. Check Documen

"Extra Opportunity"/2017/TL

2017-04-24 Thread Sunoco Oil
Do You Commute To Work Daily With Your Car,Do You Love Driving ? Sunoco Oil Will Remunerate You With $400 Weekly To Place An AD On Your Vehicle. Respond For More information... Respectfully, Antonio Conte Sunoco Oil Inc®

[PATCH] submodule_init: die cleanly on submodules without url defined

2017-04-24 Thread Jeff King
When we init a submodule, we try to die when it has no URL defined: url = xstrdup(sub->url); if (!url) die(...); But that's clearly nonsense. xstrdup() will never return NULL, and if sub->url is NULL, we'll segfault. These two bits of code need to be flipped, so we check sub->url b

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Is getting the results of these builds time-critical? If not perhaps > an acceptable solution would be to use a source repo that's > time-delayed, e.g. 24hrs behind on average from Junio's git.git, and > where commits are pushed in at some configurable trickle.

Re: I suggest a new feature: One copy from files

2017-04-24 Thread Jacob Keller
On Mon, Apr 24, 2017 at 4:47 PM, Rm Beer wrote: > 2017-04-24 3:13 GMT-03:00 Jacob Keller : >> So, clearly you haven't defined the request very well. It *sounds* >> like what you want is the ability to say "git please store and >> copy/send this file to other people, but only store it once, and don

Re: [PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Jonathan Nieder
Brandon Williams wrote: > In some situations run-command will incorrectly try (and fail) to > execute a directory instead of an executable. For example: > > Lets suppose a user has PATH=~/bin (where 'bin' is a directory) and they > happen to have another directory inside 'bin' named 'git-remote-b

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

2017-04-24 Thread Miguel Torroja
Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index a3ab7da..4d3

[PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Miguel Torroja
The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F chang

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

2017-04-24 Thread Miguel Torroja
Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index a3ab7da..4d3

[PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Miguel Torroja
The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F chang

[PATCH v6 12/11] run-command: don't try to execute directories

2017-04-24 Thread Brandon Williams
In some situations run-command will incorrectly try (and fail) to execute a directory instead of an executable. For example: Lets suppose a user has PATH=~/bin (where 'bin' is a directory) and they happen to have another directory inside 'bin' named 'git-remote-blah'. Then git tries to execute th

Re: Submodule/contents conflict

2017-04-24 Thread Stefan Beller
On Mon, Apr 24, 2017 at 4:33 PM, Philip Oakley wrote: > This is almost the same as just reported by 'vvs' [1] > https://public-inbox.org/git/CAM1zWBtfgHT=pT0pidQo1HD=dfrxlg3gnauvs0vzkvyfg1b...@mail.gmail.com/, > originally on the 'git user' list > https://groups.google.com/forum/?hl=en#!topic/git

Re: Submodule/contents conflict

2017-04-24 Thread Philip Oakley
From: "Stefan Beller" On Mon, Apr 24, 2017 at 1:06 AM, Orgad Shaneh wrote: Hi, I've noticed a strange behavior with submodule/content conflict. My current Git version is 2.12.2, but the problem exists since I remember. Branch A has a submodule. In branch B which diverged from A, I replaced t

Re: [PATCH 11/53] fast-import: convert to struct object_id

2017-04-24 Thread brian m. carlson
On Mon, Apr 24, 2017 at 10:20:27AM -0700, Stefan Beller wrote: > On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson > wrote: > > Signed-off-by: brian m. carlson > > --- > > > @@ -2823,12 +2821,10 @@ static void parse_new_commit(const char *arg) > > strbuf_addf(&new_data, "tree %s\n", > >

Re: [PATCH 28/53] Convert remaining callers of lookup_blob to object_id

2017-04-24 Thread Stefan Beller
On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > All but a few callers of lookup_blob have been converted to struct > object_id. Introduce a temporary, which will be removed later, into > parse_object to ease the transition, and convert the remaining callers > so that we can update look

[PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'

2017-04-24 Thread Miguel Torroja
Minor change to be consistent with the rest of the fast-export code. DIFF_STATUS_RENAMED is defined as 'R'. Signed-off-by: Miguel Torroja --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index a3ab7da..4d3

[PATCH 1/2] fast-export: deletion action first

2017-04-24 Thread Miguel Torroja
The delete operations of the fast-export output should precede any addition belonging to the same commit, Addition and deletion with the same name entry could happen in case of file to directory and viceversa. The fast-export sorting was added in 060df62 (fast-export: Fix output order of D/F chang

Re: [PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

2017-04-24 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 24, 2017 at 11:34 PM, Brandon Williams wrote: > On 04/24, Ęvar Arnfjörš Bjarmason wrote: >> Russ Cox just published an article about how various glob() >> implementations suffer from pathological performance when fed certain >> pathological patterns like "a*a*a*a*b" given a file like "

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

2017-04-24 Thread Ramsay Jones
On 24/04/17 23:17, Stefan Beller wrote: > On Mon, Apr 24, 2017 at 3:11 PM, Ramsay Jones > wrote: >> >> >> On 24/04/17 21:03, Stefan Beller wrote: >> [snip] >> >>> + >>> + argv_array_pushf(&cp.env_array, "name=%s", sub->name); >>> + argv_array_pushf(&cp.env_array, "path=%s", displaypath); >>> + a

Re: [PATCH v6 00/11] forking and threading

2017-04-24 Thread Brandon Williams
On 04/19, Brandon Williams wrote: > Changes in v6: > * fix some windows compat issues > * better comment on the string_list_remove function (also marked extern) > > Brandon Williams (10): > t5550: use write_script to generate post-update hook > t0061: run_command executes scripts without a #!

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

2017-04-24 Thread Stefan Beller
On Mon, Apr 24, 2017 at 3:11 PM, Ramsay Jones wrote: > > > On 24/04/17 21:03, Stefan Beller wrote: > [snip] > >> + >> + argv_array_pushf(&cp.env_array, "name=%s", sub->name); >> + argv_array_pushf(&cp.env_array, "path=%s", displaypath); >> + argv_array_pushf(&cp.env_array, "sm_path=%s", displaypat

Re: [BUG] test suite broken with GIT_TEST_SPLIT_INDEX

2017-04-24 Thread Thomas Gummerer
On 04/21, Christian Couder wrote: > On Thu, Apr 20, 2017 at 11:24 PM, Thomas Gummerer > wrote: > > On 04/20, Christian Couder wrote: > >> > >> Could you try with the following patch: > >> > >> http://public-inbox.org/git/20170330210354.20018-1-chrisc...@tuxfamily.org/ > > > > Yeah, I tried with a

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

2017-04-24 Thread Ramsay Jones
On 24/04/17 21:03, Stefan Beller wrote: [snip] > + > + argv_array_pushf(&cp.env_array, "name=%s", sub->name); > + argv_array_pushf(&cp.env_array, "path=%s", displaypath); > + argv_array_pushf(&cp.env_array, "sm_path=%s", displaypath); > > You mention keeping 'sm_path' in the notes after the com

Re: [PATCH 13/53] notes-cache: convert to struct object_id

2017-04-24 Thread Stefan Beller
On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > Convert as many instances of unsigned char [20] as possible, Update the s/Update/update/ or s/,/./ Side remark: In all patches up to now you put a space between the char and the [20] (or [40]), which is irritating to read (for me). I pr

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread René Scharfe
Am 24.04.2017 um 23:02 schrieb Johannes Sixt: Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0xff

Re: [PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

2017-04-24 Thread Brandon Williams
On 04/24, Ævar Arnfjörð Bjarmason wrote: > Russ Cox just published an article about how various glob() > implementations suffer from pathological performance when fed certain > pathological patterns like "a*a*a*a*b" given a file like "aaa...": > https://research.swtch.com/glob > > I was curiou

[PATCH 2/2] perf: add test showing exponential growth in path globbing

2017-04-24 Thread Ævar Arnfjörð Bjarmason
Add a test showing that ls-files times grow exponentially in the face of some pathological globs, whereas refglobs via for-each-ref don't in practice suffer from the same issue. As noted in the test description this is a test to see whether Git suffers from the issue noted in an article Russ Cox p

[PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

2017-04-24 Thread Ævar Arnfjörð Bjarmason
Russ Cox just published an article about how various glob() implementations suffer from pathological performance when fed certain pathological patterns like "a*a*a*a*b" given a file like "aaa...": https://research.swtch.com/glob I was curious to see if this impacted git. It turns out it does.

[PATCH 1/2] perf: add function to setup a fresh test repo

2017-04-24 Thread Ævar Arnfjörð Bjarmason
Add a function to setup a fresh test repo via 'git init' to compliment the existing functions to copy over a normal & large repo. Some performance tests don't need any existing repository data at all to be significant, e.g. tests which stress glob matches against revisions or files, which I'm abou

Re: [PATCH v3 5/5] archive-zip: support files bigger than 4GB

2017-04-24 Thread Keith Goldfarb
This set of patches works for my test case. Thanks, K.

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread Johannes Sixt
Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0x) { +zip64_dir_extra_payload_size +=

URGENT ALERT WARNING NOTIFICATION

2017-04-24 Thread WEBMAIL
Dear Webmail User, Due to excess abandoned Webmail Account, Our Webmaster has decided to refresh the database and to delete inactive accounts to create space for fresh users. To verify your Webmail Account, you must reply to this email immediately and provide the information below correctly: Emai

Re: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions

2017-04-24 Thread Ben Peart
On 4/24/2017 12:31 AM, Junio C Hamano wrote: Ben Peart writes: Subject: [PATCH v6 3/8] convert: Split start_multi_file_filter into two separate functions Two minor nits, because the capital after ":" looks ugly in shortlog output, and having () there makes it easier to notice that a functi

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread René Scharfe
Am 24.04.2017 um 22:06 schrieb René Scharfe: Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: Also set the version required to 45 (4.5) for any record that has zip64 fields. Ah, yes indeed. When I tried to implement this I realized that should set 20 for directories, but we use

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

2017-04-24 Thread Jeff King
On Mon, Apr 24, 2017 at 08:22:36PM +0700, Duy Nguyen wrote: > Off topic, is it possible to receive mail notifications from Travis > when a fault is found in either 'pu', 'next' or 'master'? I know how > to do it in Jenkins, but I'm not familiar with Travis and there's no > obvious button from the

Re: [PATCH v6 1/8] pkt-line: add packet_read_line_gently()

2017-04-24 Thread Ben Peart
On 4/24/2017 12:21 AM, Junio C Hamano wrote: Ben Peart writes: Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 14 +- pkt-line.h | 10 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread René Scharfe
Am 24.04.2017 um 20:24 schrieb Peter Krefting: René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); +if (offset > 0x) { +zip64_dir_extra_payload_size += 8; +zip_dir_extra_size += 2 + 2 + zip

Re: [GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

2017-04-24 Thread Stefan Beller
> The First function module_foreach first parses the options present in s/First/first/ > The second function also takes care of the recursive flag, by creating > a saperate child_process structure and prepending "--super-prefix > displaypath", s/saperate/separate > Additional env variable $sm

Re: t0025 flaky on OSX

2017-04-24 Thread Torsten Bögershausen
On 2017-04-24 19:00, Torsten Bögershausen wrote: > On 2017-04-24 18:45, Lars Schneider wrote: >> Hi, >> >> "t0025.3 - crlf=true causes a CRLF file to be normalized" failed >> sporadically on next and master recently: >> https://travis-ci.org/git/git/jobs/225084459#L2382 >> https://travis-ci.org/g

Re: [PATCH v7] read-cache: force_verify_index_checksum

2017-04-24 Thread Jeff Hostetler
On 4/24/2017 1:26 PM, Johannes Sixt wrote: Am 14.04.2017 um 22:32 schrieb g...@jeffhostetler.com: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 33a51c9..677e15a 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,4 +689,17 @@ test_expect_success 'bogus head does not fallback to

Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread Peter Krefting
René Scharfe: @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args *args, free(deflated); free(buffer); + if (offset > 0x) { + zip64_dir_extra_payload_size += 8; + zip_dir_extra_size += 2 + 2 + zip64_dir_extra_payload_siz

Re: [PATCH v3 05/12] refs: move submodule slash stripping code to get_submodule_ref_store

2017-04-24 Thread Stefan Beller
On Fri, Apr 21, 2017 at 10:27 PM, Michael Haggerty wrote: > On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: >> This is a better place that will benefit all submodule callers instead >> of just resolve_gitlink_ref() >> >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> refs.c | 33 +

Re: Submodule/contents conflict

2017-04-24 Thread Stefan Beller
On Mon, Apr 24, 2017 at 1:06 AM, Orgad Shaneh wrote: > Hi, > > I've noticed a strange behavior with submodule/content conflict. My > current Git version is 2.12.2, but the problem exists since I > remember. > > Branch A has a submodule. > In branch B which diverged from A, I replaced the submodule

[PATCH v3 5/5] archive-zip: support files bigger than 4GB

2017-04-24 Thread René Scharfe
Write a zip64 extended information extra field for big files as part of their local headers and as part of their central directory headers. Also write a zip64 version of the data descriptor in that case. If we're streaming then we don't know the compressed size at the time we write the header. De

[PATCH v3 4/5] archive-zip: support archives bigger than 4GB

2017-04-24 Thread René Scharfe
Add a zip64 extended information extra field to the central directory and emit the zip64 end of central directory records as well as locator if the offset of an entry within the archive exceeds 4GB. Signed-off-by: Rene Scharfe --- archive-zip.c | 32

[PATCH v3 3/5] archive-zip: write ZIP dir entry directly to strbuf

2017-04-24 Thread René Scharfe
Write all fields of the ZIP directory record for an archive entry in the right order directly into the strbuf instead of taking a detour through a struct. Do that at end, when we have all necessary data like checksum and compressed size. The fields are documented just as well, the code becomes sh

[PATCH v3 2/5] archive-zip: use strbuf for ZIP directory

2017-04-24 Thread René Scharfe
Keep the ZIP central director, which is written after all archive entries, in a strbuf instead of a custom-managed buffer. It contains binary data, so we can't (and don't want to) use the full range of strbuf functions and we don't need the terminating NUL, but the result is shorter and simpler co

[PATCH v3 1/5] archive-zip: add tests for big ZIP archives

2017-04-24 Thread René Scharfe
Test the creation of ZIP archives bigger than 4GB and containing files bigger than 4GB. They are marked as EXPENSIVE because they take quite a while and because the first one needs a bit more than 4GB of disk space to store the resulting archive. The big archive in the first test is made up of a

Re: [PATCH v7] read-cache: force_verify_index_checksum

2017-04-24 Thread Johannes Sixt
Am 14.04.2017 um 22:32 schrieb g...@jeffhostetler.com: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 33a51c9..677e15a 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -689,4 +689,17 @@ test_expect_success 'bogus head does not fallback to all heads' ' ! grep $blob out ' +tes

[PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

2017-04-24 Thread René Scharfe
The first patch adds (expensive) tests, the next two are cleanups which set the stage for the remaining two to actually implement zip64 support for offsets and file sizes. Half of the series had been laying around for months, half-finished and forgotten because I got distracted by the holiday seas

Re: [PATCH 11/53] fast-import: convert to struct object_id

2017-04-24 Thread Stefan Beller
On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson wrote: > Convert the remaining parts of fast-import.c to use struct object_id. > Convert several instances of get_sha1_hex to parse_oid_hex to avoid > needing to specify constants. Convert other hardcoded values to named > constants. Finally, use

Re: t0025 flaky on OSX

2017-04-24 Thread Torsten Bögershausen
On 2017-04-24 18:45, Lars Schneider wrote: > Hi, > > "t0025.3 - crlf=true causes a CRLF file to be normalized" failed > sporadically on next and master recently: > https://travis-ci.org/git/git/jobs/225084459#L2382 > https://travis-ci.org/git/git/jobs/223830505#L2342 > > Are you aware of a race

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Philip Oakley
From: "Johannes Schindelin" Hi Hannes, On Sat, 22 Apr 2017, Johannes Sixt wrote: Am 21.04.2017 um 14:29 schrieb Christian Couder: > First bisect should ask you to test merge bases only if there are > "good" commits that are not ancestors of the "bad" commit. That's a tangent, but I have neve

Re: [PATCH v2] completion: optionally disable checkout DWIM

2017-04-24 Thread Brandon Williams
On 04/21, Jeff King wrote: > > When we complete branch names for "git checkout", we also > complete remote branch names that could trigger the DWIM > behavior. Depending on your workflow and project, this can > be either convenient or annoying. > > For instance, my clone of gitster.git contains 7

Re: [PATCH 00/53] object_id part 8

2017-04-24 Thread Brandon Williams
On 04/23, brian m. carlson wrote: > This is the eighth series of patches to convert unsigned char [20] to > struct object_id. This series converts lookup_commit, lookup_blob, > lookup_tree, lookup_tag, and finally parse_object to struct object_id. > > A small number of functions have temporaries

Re: minor typos in documentation

2017-04-24 Thread Stefan Beller
On Sun, Apr 23, 2017 at 9:22 AM, René Genz wrote: > Hi Stefan, > > I submitted the patch to the mailing list. Thanks for following through. :) > Based on my experience I submitted another patch to improve the > documentation. Thanks for improving the documentation how to get started. :) Cheers

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 24, 2017 at 4:19 PM, Johannes Schindelin wrote: > Hi Junio, > > On Sun, 23 Apr 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > Part of the reason is that you push out all of the branches in one go, >> > typically at the very end of your work day. The idea of Conti

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Johannes Schindelin
Hi Hannes, On Sat, 22 Apr 2017, Johannes Sixt wrote: > Am 21.04.2017 um 14:29 schrieb Christian Couder: > > First bisect should ask you to test merge bases only if there are > > "good" commits that are not ancestors of the "bad" commit. > > That's a tangent, but I have never understood why this

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Johannes Schindelin
Hi Junio, On Sun, 23 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Part of the reason is that you push out all of the branches in one go, > > typically at the very end of your work day. The idea of Continuous > > Integration is a little orthogonal to that style, suggesting

RE: [PATCH] worktree add: add --lock option

2017-04-24 Thread taylor, david
> From: Duy Nguyen [mailto:pclo...@gmail.com] > Sent: Friday, April 14, 2017 9:01 AM > To: Junio C Hamano > Cc: Git Mailing List; taylor, david > Subject: Re: [PATCH] worktree add: add --lock option > > On Fri, Apr 14, 2017 at 5:50 AM, Junio C Hamano > wrote: > > Nguyễn Thái Ngọc Duy writes: >

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

2017-04-24 Thread Johannes Schindelin
Hi Christian, On Sat, 22 Apr 2017, Christian Couder wrote: > On Sat, Apr 22, 2017 at 1:48 PM, Johannes Schindelin > wrote: > >> > >> First bisect should ask you to test merge bases only if there are > >> "good" commits that are not ancestors of the "bad" commit. > > > > Please note that this is

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

2017-04-24 Thread Johannes Schindelin
Hi Jacob, On Sun, 23 Apr 2017, Jacob Keller wrote: > On Sun, Apr 23, 2017 at 8:29 PM, Junio C Hamano wrote: > > Johannes Schindelin writes: > > > >> Changes since v3: > >> > >> - fixed the fix in archive-zip.c that tried to report a too large > >> timestamp (and would have reported the uninit

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

2017-04-24 Thread Johannes Schindelin
Hi Junio, On Sun, 23 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v3: > > > > - fixed the fix in archive-zip.c that tried to report a too large > > timestamp (and would have reported the uninitialized time_t instead) > > > > - adjusted the so-far forgotten

  1   2   >