Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Eric Sunshine
On Tue, Aug 9, 2016 at 12:08 AM, Stefan Beller wrote: > t7408: modernize style > > Signed-off-by: Stefan Beller > --- > diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh > @@ -8,74 +8,76 @@ test_description='test clone --reference' > +test_expect_success 'that reference

Re: t0027 racy?

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 02:51:10AM -0400, Jeff King wrote: > - index raciness causing us to avoid reading file content. For > example, if you do: > > echo foo >bar > git add bar > > Then _usually_ "bar" and the index will have the same mtime. And > therefore subsequent

Re: storing cover letter of a patch series?

2016-08-09 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 08.08.2016 19:42: > Duy Nguyen writes: > >> git-notes was mentioned in this thread back in 2015, but I think it's >> discarded because of the argument that's part of the cover letter was >> not meant to be kept permanently. > > I do not think the reason why we

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Michael J Gruber
Michael Haggerty venit, vidit, dixit 09.08.2016 01:20: > Given that I work for GitHub, I'm uncomfortable doing any more advocacy > here. If people have concrete questions, I'd be happy to answer them, on > the list or in private. You're doing a great job differentiating between your roles as a mem

Thunderbird woes, was: Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jakub Narębski
On 9 August 2016 at 10:11, Michael J Gruber wrote: > My own setup > > > My usual MUA is Thunderbird because of its integration with calendars > and address books. I usually read and post to mailing lists via > nntp/gmane, that works best for me for several reasons (e.g. archive > ava

[PATCH] Spelling fixes

2016-08-09 Thread Ville Skyttä
Signed-off-by: Ville Skyttä --- Documentation/RelNotes/2.3.10.txt | 2 +- Documentation/RelNotes/2.4.10.txt | 2 +- Documentation/RelNotes/2.5.4.txt| 2 +- Documentation/RelNotes/2.6.1.txt| 2 +- Documentation/git-remote-fd.txt | 2 +- Docum

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Richard Ipsum
On Tue, Aug 09, 2016 at 06:22:21AM +0200, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 12:20 AM, Michael Haggerty > wrote: > > On 08/04/2016 05:58 PM, Johannes Schindelin wrote: > >> [...] > >> Even requiring every contributor to register with GitHub would be too much > >> of a limitation, I would

[PATCH v2] completion: complete --delete, --move, and --remotes for git branch

2016-08-09 Thread Ville Skyttä
Signed-off-by: Ville Skyttä --- contrib/completion/git-completion.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6a187bc..76abbd1 100644 --- a/contrib/completion/git-completion.b

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Michael Haggerty
On 08/09/2016 06:22 AM, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 12:20 AM, Michael Haggerty > wrote: >> On 08/04/2016 05:58 PM, Johannes Schindelin wrote: >>> [...] >>> Even requiring every contributor to register with GitHub would be too much >>> of a limitation, I would wager. >>> [...] >> >>

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 10:17:22AM +0100, Richard Ipsum wrote: > > In the very unlikely event that github is shut down, how do we get all > > review comments out of it, assuming that we will use pull requests for > > review? > > For what it's worth this is exactly why I think it would be worthwhi

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 10:11:30AM +0200, Michael J Gruber wrote: > Maybe two more points of input for the discussion: > > off-line capabilities > = > > The current workflow here seems to work best when you are subscribed to > the git-ml and have your own (local, maybe select

Re: [PATCH v5] pack-objects: teach it to use reachability bitmap index when generating non-stdout pack too

2016-08-09 Thread Kirill Smelkov
On Mon, Aug 08, 2016 at 01:53:20PM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index bc1c433..4ba0c4a 100644 > > --- a/Documentation/config.txt > > +++ b/Documentation/config.txt > > @@ -2244,6 +2244,9 @@ pack.us

Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental

2016-08-09 Thread Kirill Smelkov
Junio, first of all thanks for feedback, On Mon, Aug 08, 2016 at 12:26:33PM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: [...] > > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > > index c4c2a3c..e06c1bf 100644 > > --- a/builtin/pack-objects.c > > +++ b/builtin/pack-object

Re: t0027 racy?

2016-08-09 Thread Johannes Schindelin
Hi Torsten, On Mon, 8 Aug 2016, Torsten Bögershausen wrote: > On 2016-08-08 17.05, Johannes Schindelin wrote: > > > > I remember that you did a ton of work on t0027. Now I see problems, > > and not only that the entire script now takes a whopping 4 minutes 20 > > seconds to run on my high-end Wi

[PATCH 1/2 v4] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use

2016-08-09 Thread Kirill Smelkov
Since 6b8fda2d (pack-objects: use bitmaps when packing objects) there are two codepaths in pack-objects: with & without using bitmap reachability index. However add_object_entry_from_bitmap(), despite its non-bitmapped counterpart add_object_entry(), in no way does check for whether --local or --h

[PATCH 2/2 v6] pack-objects: use reachability bitmap index when generating non-stdout pack

2016-08-09 Thread Kirill Smelkov
Starting from 6b8fda2d (pack-objects: use bitmaps when packing objects) if a repository has bitmap index, pack-objects can nicely speedup "Counting objects" graph traversal phase. That however was done only for case when resultant pack is sent to stdout, not written into a file. The reason here is

Re: t0027 racy?

2016-08-09 Thread Johannes Schindelin
Hi Peff, On Tue, 9 Aug 2016, Jeff King wrote: > And indeed, this seems to fix it for me (at least it has been running in > a 16-way loop for 5 minutes, whereas before it died after 30 seconds or > so): > > diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh > index 2860d2d..9f057ff 100755 >

Re: t0027 racy?

2016-08-09 Thread Torsten Bögershausen
On Tue, Aug 09, 2016 at 02:51:10AM -0400, Jeff King wrote: > On Mon, Aug 08, 2016 at 08:32:24PM +, Torsten Bögershausen wrote: > > > > The verbose output is not very exciting, though: > > > > > > expecting success: > > > check_warning "$lfwarn" ${pfx}_LF.err > > > > > >

Re: t0027 racy?

2016-08-09 Thread Johannes Schindelin
Hi Peff, On Mon, 8 Aug 2016, Jeff King wrote: > I got failure within about 30 seconds on t0027 (though 5 minutes? Yeesh. > It runs in 9s on my laptop. I weep for you). Yep. That is the price I (and all other Git for Windows developers) pay for the decision to implement Git's entire test suite in

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 01:20:05AM +0200, Michael Haggerty wrote: > > but I > > do not think it is sane to expect that the same quality and quantity > > of reviews as we do here can be maintained with that thing. > > Could you elaborate why you would expect quality and/or quantity of > reviews to

Re: t0027 racy?

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 01:33:04PM +0200, Johannes Schindelin wrote: > On Mon, 8 Aug 2016, Jeff King wrote: > > > I got failure within about 30 seconds on t0027 (though 5 minutes? Yeesh. > > It runs in 9s on my laptop. I weep for you). > > Yep. That is the price I (and all other Git for Windows

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Johannes Schindelin
Hi Junio, On Mon, 8 Aug 2016, Junio C Hamano wrote: > Lars Schneider writes: > > > 4.) Reviewing patches is super hard for me because my email client > > does not support patch color highlighting and I can't easily expand > > context or look at the history of code touched by the patch (e.g via

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Johannes Schindelin
Hi Junio, On Mon, 8 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I think you both got it wrong. The original citizens were the mail > > clients that allowed you to communicate with other human beings. > > ... It is our usage to transport machine-readable content (and not

Re: t0027 racy?

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 11:33:37AM +, Torsten Bögershausen wrote: > > The second one seems plausible, given the history of issues with > > changing CRLF settings for an existing checkout. I'm not sure if it > > would be feasible to reset the index completely before each tested > > command, but

[PATCH] document git-repack interaction of pack.threads and pack.windowMemory

2016-08-09 Thread Michael Stahl
Signed-off-by: Michael Stahl --- Documentation/git-pack-objects.txt | 2 +- Documentation/git-repack.txt | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 19cdcd0..0b655a5 100644 --- a/Do

Re: Thunderbird woes, was: Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Michael J Gruber
Jakub Narębski venit, vidit, dixit 09.08.2016 10:24: > On 9 August 2016 at 10:11, Michael J Gruber wrote: > >> My own setup >> >> >> My usual MUA is Thunderbird because of its integration with calendars >> and address books. I usually read and post to mailing lists via >> nntp/gmane,

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Johannes Schindelin
Hi Michael, On Tue, 9 Aug 2016, Michael Haggerty wrote: > On 08/04/2016 05:58 PM, Johannes Schindelin wrote: > > [...] > > Even requiring every contributor to register with GitHub would be too > > much of a limitation, I would wager. > > [...] > > Is it *really* so insane to consider moving coll

Re: t0027 racy?

2016-08-09 Thread Torsten Bögershausen
On Tue, Aug 09, 2016 at 07:49:38AM -0400, Jeff King wrote: > On Tue, Aug 09, 2016 at 11:33:37AM +, Torsten Bögershausen wrote: > > > > The second one seems plausible, given the history of issues with > > > changing CRLF settings for an existing checkout. I'm not sure if it > > > would be feasi

Re: t0027 racy?

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 12:59:58PM +, Torsten Bögershausen wrote: > Thanks for the explanation, so there are 2 chances for a race. > > I assume that the suggested "touch" will fix race#2 in most cases. > In my understanding, the change of the file size will be more reliable: > > > diff --g

Re: [PATCH v2 7/7] pack-objects: use mru list when iterating over packs

2016-08-09 Thread Jeff King
On Mon, Aug 08, 2016 at 10:16:32AM -0700, Junio C Hamano wrote: > Jeff King writes: > > >> It worries me a lot to lose the warning unconditionally, though. > >> That's the (only) coal-mine canary that lets us notice a problem > >> when we actually start hitting that last-ditch cycle breaking too

[PATCH 1/2] config.c: avoid duplicated global static variables

2016-08-09 Thread Johannes Sixt
Repeating the definition of a static variable seems to be valid in C. Nevertheless, it is bad style because it can cause confusion, definitely when it becomes necessary to change the type. d64ec16 (git config: reorganize to use parseopt, 2009-02-21) added two static variables near the top of the f

[PATCH 2/2] commit-slab.h: avoid duplicated global static variables

2016-08-09 Thread Johannes Sixt
The gigantic define_commit_slab() macro repeats the definition of a static variable that occurs earlier in the macro text. The purpose of the repeated definition at the end of the macro is that it takes the semicolon that occurs where the macro is used. We cannot just remove the first definition o

Re: [PATCH 2/2] commit-slab.h: avoid duplicated global static variables

2016-08-09 Thread Johannes Sixt
BTW, these are all instances of duplicated global static variables that can be found in a standard Linux build. How I found them? I waded through the error messages produced by compiling the code base as C++ code for the fun of it (basically CFLAGS='-x c++ -fpermissive'). -- Hannes -- To un

Re: [PATCH v10 28/40] builtin/apply: rename option parsing functions

2016-08-09 Thread stefan.naewe
Am 08.08.2016 um 23:03 schrieb Christian Couder: > As these functions are going to be part of the libified > apply api, let's give them a name that is more specific > to the apply api. s/api/API/ > > Signed-off-by: Christian Couder > --- > builtin/apply.c | 40 -

Re: [PATCH v10 01/40] apply: make some names more specific

2016-08-09 Thread stefan.naewe
Am 08.08.2016 um 23:02 schrieb Christian Couder: > To prepare for some structs and constants being moved from > builtin/apply.c to apply.h, we should give them some more > specific names to avoid possible name collisions in th global s/th/the/ > namespace. > > Signed-off-by: Christian Couder >

Re: What's cooking in git.git (Aug 2016, #03; Mon, 8)

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > On Mon, Aug 8, 2016 at 3:32 PM, Junio C Hamano wrote: >> >> * sb/submodule-clone-rr (2016-08-06) 6 commits >> - clone: reference flag is used for submodules as well >> - submodule update: add super-reference flag >> - submodule--helper update-clone: allow multiple refe

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > v3: > > Thanks to Junios critial questions regarding the design, I took a step back > to look at the bigger picture. > > --super-reference sounds confusing. (what is the super referring to?) > So drop that approach. > > Instead we'll compute where the reference might be i

Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Aug 9, 2016 at 12:08 AM, Stefan Beller wrote: >> t7408: modernize style >> >> Signed-off-by: Stefan Beller >> --- >> diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh >> @@ -8,74 +8,76 @@ test_description='test clone --reference' >> +te

Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Junio C Hamano
Junio C Hamano writes: > Eric Sunshine writes: > >> On Tue, Aug 9, 2016 at 12:08 AM, Stefan Beller wrote: >>> t7408: modernize style >>> >>> Signed-off-by: Stefan Beller >>> --- >>> diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh >>> @@ -8,74 +8,76 @@ test_descript

Re: [PATCHv3 6/9] clone: implement optional references

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > @@ -283,11 +286,22 @@ static void strip_trailing_slashes(char *dir) > static int add_one_reference(struct string_list_item *item, void *cb_data) > { > char *ref_git; > - const char *repo; > + const char *repo, *ref_git_s; > + int *required = cb_data; >

Re: [PATCHv3 9/9] submodule--helper: use parallel processor correctly.

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > When implementing the die() in 665b35ecc (2016-06-09, "submodule--helper: > initial clone learns retry logic"), I considered this condition to be > a severe condition, which should lead to an immediate abort as we do not > trust ourselves any more. However the queued messa

Re: [PATCHv3 2/9] t7408: merge short tests, factor out testing method

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > +# The tests up to this point, and repositories created by them > +# (A, B, super and super/sub), are about setting up the stage > +# forsubsequent tests and meant to be kept throughout the s/forsub/for sub/; -- To unsubscribe from this list: send the line "unsubscribe gi

Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental

2016-08-09 Thread Junio C Hamano
Kirill Smelkov writes: > Would you please explain why we should not use touch if we do not care > about timestamps? Simply style? To help readers. "touch A" forcess the readers wonder "does the timestamp of A matter, and if so in what way?" and "does any later test care what is _in_ A, and if s

Re: [PATCH 2/2] commit-slab.h: avoid duplicated global static variables

2016-08-09 Thread Junio C Hamano
Johannes Sixt writes: > * like function declarations. I.e., the expansion of > * > *define_commit_slab(indegree, int); > * > - * ends in 'static int stat_indegreerealloc;'. This would otherwise > + * ends in 'struct indegree;'. This would otherwise > * be a syntax error according

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Junio C Hamano
Johannes Schindelin writes: > On Mon, 8 Aug 2016, Junio C Hamano wrote: > >> Unless a patch is about an area you are super familiar with so that you >> know what is beyond the context of the patch to be able to judge if the >> change is good in the context of the file being touched, it is always

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 8:49 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> v3: >> >> Thanks to Junios critial questions regarding the design, I took a step back >> to look at the bigger picture. >> >> --super-reference sounds confusing. (what is the super referring to?) >> So drop that ap

Re: [PATCHv3 2/9] t7408: merge short tests, factor out testing method

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 9:41 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> +# The tests up to this point, and repositories created by them >> +# (A, B, super and super/sub), are about setting up the stage >> +# forsubsequent tests and meant to be kept throughout the > > s/forsub/for sub/;

Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 8:51 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Eric Sunshine writes: >> I originally thought that it may be easier to have 2 patches. This first one is very gentle and "obviously correct" as it only changes formatting and drops the directory changes. The se

Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Aug 9, 2016 at 8:51 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Eric Sunshine writes: >>> > > I originally thought that it may be easier to have 2 patches. > This first one is very gentle and "obviously correct" as it only changes > formatting and

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Junio C Hamano
Jeff King writes all what I wanted to say, and a lot more, so I don't have to say much ;-) > - I really like the flow of having conversations next to patches. I can >look at the index of the mailing list folder and see what people are >talking about, how big the threads are, etc, at a gl

Re: [PATCH v2 7/7] pack-objects: use mru list when iterating over packs

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 10:04:11AM -0400, Jeff King wrote: > Here's the code to do the cycle-breaking. > [...] > It seems to perform well, and it does break the cycles (the later check > during the write does not kick in, and we get no warnings). I didn't dig > into the fates of specific objects,

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > "you did ask me to use alternates once and for all when setting up the > superproject: now for this added submodule I don't find the alternate; > That is strange?" Absolutely. I do not think you should expect a user to remember if s/he used alternates when getting a copy

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 10:34:11AM -0700, Junio C Hamano wrote: > >The threading in GitHub comments and pull requests is also not great. > >Each PR or issue is its own thread, but it's totally flat inside. > >There are no sub-threads to organize discussion, and it's sometimes > >ha

Re: [PATCHv3 6/9] clone: implement optional references

2016-08-09 Thread Junio C Hamano
Junio C Hamano writes: > If I am reading the implementation of real_path_internal() > correctly, the most relevant reason that an "if-able" repository > cannot be used causes real_path_if_valid() to return NULL. Oops, too many proofreading and rephrasing. Please insert "I do not think that" bef

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >> "you did ask me to use alternates once and for all when setting up the >> superproject: now for this added submodule I don't find the alternate; >> That is strange?" > > Absolutely. I do not think you should expect a user to remember if > s/he

Re: [PATCH v2 7/7] pack-objects: use mru list when iterating over packs

2016-08-09 Thread Junio C Hamano
Jeff King writes: > I ran the repack again with stock git (no MRU patch), and the number of > objects in the delta phase jumped to 3087880, around 56,000 more than > with the MRU patch. So that's probably where the magic "3%" is coming > from. By looking at the smaller packs first, we are more l

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 10:47 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> "you did ask me to use alternates once and for all when setting up the >> superproject: now for this added submodule I don't find the alternate; >> That is strange?" > > Absolutely. I do not think you should expe

Re: [PATCH] Spelling fixes

2016-08-09 Thread Junio C Hamano
Ville Skyttä writes: > Signed-off-by: Ville Skyttä > --- > Documentation/RelNotes/2.3.10.txt | 2 +- > Documentation/RelNotes/2.4.10.txt | 2 +- > Documentation/RelNotes/2.5.4.txt| 2 +- > Documentation/RelNotes/2.6.1.txt| 2 +- > Documentation/git-re

Re: [PATCHv3 6/9] clone: implement optional references

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 10:54 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> If I am reading the implementation of real_path_internal() >> correctly, the most relevant reason that an "if-able" repository >> cannot be used causes real_path_if_valid() to return NULL. > > Oops, too many proo

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Eric Wong
Michael Haggerty wrote: > On 08/04/2016 05:58 PM, Johannes Schindelin wrote: > > [...] > > Even requiring every contributor to register with GitHub would be too much > > of a limitation, I would wager. > > [...] > * Discussion of pull requests can be done either > * via the website (super easy

Re: [PATCH] document git-repack interaction of pack.threads and pack.windowMemory

2016-08-09 Thread Junio C Hamano
Michael Stahl writes: > Signed-off-by: Michael Stahl > --- > Documentation/git-pack-objects.txt | 2 +- > Documentation/git-repack.txt | 6 +- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-pack-objects.txt > b/Documentation/git-pack-objects.txt

Re: [PATCH v2] completion: complete --delete, --move, and --remotes for git branch

2016-08-09 Thread Junio C Hamano
Ville Skyttä writes: > Signed-off-by: Ville Skyttä > --- > contrib/completion/git-completion.bash | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > index 6a187bc..76abbd1 100644 > -

[PATCH] completion: add completion for --submodule=* diff option

2016-08-09 Thread Jacob Keller
From: Jacob Keller Teach git-completion.bash to complete --submodule= for git commands which take diff options. Also teach completion for git-log to support --diff-algorithms as well. Signed-off-by: Jacob Keller --- contrib/completion/git-completion.bash | 19 +++ 1 file change

Re: [PATCHv3 6/9] clone: implement optional references

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > Thinking about that we may want to not rely on such a hack, > but make it clearer. But that is far from sufficient, isn't it? You'd need to bypass "not a local repository", "shallow" and "is grafted" anyway, so in that sense, that hack is not doing much. If modules/X (or

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 1:20 AM, Michael Haggerty wrote: > Could you elaborate why you would expect quality and/or quantity of > reviews to suffer? I'm really curious, and I'd be happy to pass your > feedback along to my colleagues. Since I have been using github at work for a couple months, I do

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 8:36 PM, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 1:20 AM, Michael Haggerty wrote: >> Could you elaborate why you would expect quality and/or quantity of >> reviews to suffer? I'm really curious, and I'd be happy to pass your >> feedback along to my colleagues. > > Since

Re: [PATCH] Spelling fixes

2016-08-09 Thread Ville Skyttä
On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano wrote: [...] > There are two "commited" you seem to have missed, though, > > t/t3420-rebase-autostash.sh:echo uncommited-content >file0 && > t/t3420-rebase-autostash.sh:echo uncommited-content >expected && > > which I'll queue on top of this p

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > The way I understood and implemented it is > > here is a path, try to use it as an alternate; if that is not > an alternate, it's fine too; maybe warn about it, but carry > on with the operation. My expectation is without "maybe warn about it". And not adding

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 1:37 PM, Jeff King wrote: >That's (relatively) easy for me to script via mutt (grab >these patches, apply them). Could you share your mutt set up pleaaase? I've been wanting this for a long time, but never used mutt long enough to bother with a proper setup like thi

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 11:43 AM, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 1:37 PM, Jeff King wrote: >>That's (relatively) easy for me to script via mutt (grab >>these patches, apply them). > > Could you share your mutt set up pleaaase? I've been wanting this for > a long time, but never

Re: What's cooking in git.git (Aug 2016, #03; Mon, 8)

2016-08-09 Thread Elijah Newren
Hi, On Mon, Aug 8, 2016 at 3:32 PM, Junio C Hamano wrote: > * js/am-3-merge-recursive-direct (2016-08-01) 16 commits > (merged to 'next' on 2016-08-05 at dc1c9bb) > + merge-recursive: flush output buffer even when erroring out > + merge_trees(): ensure that the callers release output buffer >

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 08:43:59PM +0200, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 1:37 PM, Jeff King wrote: > >That's (relatively) easy for me to script via mutt (grab > >these patches, apply them). > > Could you share your mutt set up pleaaase? I've been wanting this for > a long tim

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Jeff King
On Tue, Aug 09, 2016 at 11:50:51AM -0700, Stefan Beller wrote: > > Could you share your mutt set up pleaaase? I've been wanting this for > > a long time, but never used mutt long enough to bother with a proper > > setup like this (I blame gmail). > > > That is my complaint^H^H^H^H position, too.

Re: What's cooking in git.git (Aug 2016, #03; Mon, 8)

2016-08-09 Thread Junio C Hamano
Elijah Newren writes: > So, I think the series looks good. Sorry that I didn't spot any errors. That's nothing to be sorry about--it is an excellent news. Thanks for helping. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Junio C Hamano
Jeff King writes: > On Tue, Aug 09, 2016 at 10:34:11AM -0700, Junio C Hamano wrote: > >> It may be a good UI that is optimized for drive-by contributors. It >> is just that it is not very well suited (compared to mailing list >> discussions) to conduct high-volume exchange of ideas and changes >

Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental

2016-08-09 Thread Kirill Smelkov
On Tue, Aug 09, 2016 at 09:52:18AM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > Would you please explain why we should not use touch if we do not care > > about timestamps? Simply style? > > To help readers. > > "touch A" forcess the readers wonder "does the timestamp of A > matt

[PATCH 1/2 v5] pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use

2016-08-09 Thread Kirill Smelkov
Since 6b8fda2d (pack-objects: use bitmaps when packing objects) there are two codepaths in pack-objects: with & without using bitmap reachability index. However add_object_entry_from_bitmap(), despite its non-bitmapped counterpart add_object_entry(), in no way does check for whether --local or --h

[PATCH 2/2 v7] pack-objects: use reachability bitmap index when generating non-stdout pack

2016-08-09 Thread Kirill Smelkov
Starting from 6b8fda2d (pack-objects: use bitmaps when packing objects) if a repository has bitmap index, pack-objects can nicely speedup "Counting objects" graph traversal phase. That however was done only for case when resultant pack is sent to stdout, not written into a file. The reason here is

Re: [PATCH 2/3] i18n: archive: mark errors for translation

2016-08-09 Thread Junio C Hamano
Vasco Almeida writes: > Signed-off-by: Vasco Almeida > --- > archive.c | 10 +- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/archive.c b/archive.c > index 42df974..dde1ab4 100644 > --- a/archive.c > +++ b/archive.c > @@ -458,11 +458,11 @@ static int parse_archive_a

Re: [PATCH 3/3] i18n: git-stash: mark message for translation

2016-08-09 Thread Junio C Hamano
Vasco Almeida writes: > Signed-off-by: Vasco Almeida > --- > git-stash.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-stash.sh b/git-stash.sh > index 22fb8bc..9cbd682 100755 > --- a/git-stash.sh > +++ b/git-stash.sh > @@ -265,7 +265,7 @@ save_stash () { >

Re: [PATCH 1/2] pack-objects: Teach --use-bitmap-index codepath to respect --local, --honor-pack-keep and --incremental

2016-08-09 Thread Junio C Hamano
Kirill Smelkov writes: > On Tue, Aug 09, 2016 at 09:52:18AM -0700, Junio C Hamano wrote: >> "touch A" forcess the readers wonder "does the timestamp of A >> matter, and if so in what way?" and "does any later test care what >> is _in_ A, and if so in what way?" Both of them is wasting their >> t

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 11:44 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> The way I understood and implemented it is >> >> here is a path, try to use it as an alternate; if that is not >> an alternate, it's fine too; maybe warn about it, but carry >> on with the operation. >

Re: t0027 racy?

2016-08-09 Thread Torsten Bögershausen
> git -c core.autocrlf=$crlf add $fname >"${pfx}_$f.err" 2>&1 > > would make more sense. We _know_ that we have to do convert_to_git() in > that step because the content is changed. And then you can ignore the > warnings from "git commit" (which are racy), or you can simply commit as > a whole l

[PATCH] submodule--helper: use parallel processor correctly.

2016-08-09 Thread Stefan Beller
When developing another patch series I had a temporary state in which git-clone would segfault, when the call was prepared in prepare_to_clone_next_submodule. This lead to the call failing, i.e. in `update_clone_task_finished` the task was scheduled to be tried again. The second call to prepare_to_

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Junio C Hamano
Stefan Beller writes: > At the time of cloning you may run > > git clone --recursive --reference > or > git clone --recursive --reference-if-able > or > git clone --recursive That's an interesting tangent. I never meant "if-able" to be an end-user visible option [*1*], but now you menti

Donation!!!

2016-08-09 Thread Susanne Klatten
Dear Recipient Making charitable donation of $ 50 M to 13 People as my philanthropic gesture to the world. Interested individuals should contact me with these Code DON/CH2016'. Email: susannee.ha...@aol.com Susanne Hanne Ursula Klatten -- To unsubscribe from this list: send the line "unsubscr

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 2:45 PM, Junio C Hamano wrote: > becomes easily doable (i.e. subsequent "submodule update" can realize > that the submodule does not have alternates but it could borrow from > the submodule in the other-super-project-location). I would suggest to postpone this to a later ti

Re: [PATCH v2 7/7] pack-objects: use mru list when iterating over packs

2016-08-09 Thread Junio C Hamano
Jeff King writes: > Here's the code to do the cycle-breaking. Aside from the "hacky" bit, > it's quite simple. I added a new state enum to object_entry to handle > the graph traversal. Since it only needs 2 bits, I _assume_ a compiler > can fit it in with the bitfields above (or at the very leas

[PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Jacob Keller
From: Jacob Keller For projects which have frequent updates to submodules it is often useful to be able to see a submodule update commit as a difference. Teach diff's --submodule= a new "diff" format which will execute a diff for the submodule between the old and new commit, and display it as a s

Re: [PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Junio C Hamano
Jacob Keller writes: > +static int prepare_submodule_diff(struct strbuf *buf, const char *path, > + unsigned char one[20], unsigned char two[20]) > +{ > + struct child_process cp = CHILD_PROCESS_INIT; > + cp.git_cmd = 1; > + cp.dir = path; > + cp.out = -1; > + cp.n

Re: [PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 3:32 PM, Jacob Keller wrote: > From: Jacob Keller > > For projects which have frequent updates to submodules it is often > useful to be able to see a submodule update commit as a difference. > Teach diff's --submodule= a new "diff" format which will execute a diff > for the

Re: [PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Jacob Keller
On Tue, Aug 9, 2016 at 3:50 PM, Stefan Beller wrote: > On Tue, Aug 9, 2016 at 3:32 PM, Jacob Keller wrote: >> From: Jacob Keller >> >> For projects which have frequent updates to submodules it is often >> useful to be able to see a submodule update commit as a difference. >> Teach diff's --submo

Re: [PATCHv3 1/9] t7408: modernize style

2016-08-09 Thread Eric Sunshine
On Tue, Aug 9, 2016 at 1:39 PM, Junio C Hamano wrote: > Stefan Beller writes: >> I originally thought that it may be easier to have 2 patches. >> This first one is very gentle and "obviously correct" as it only changes >> formatting and drops the directory changes. >> >> The second patch goes for

Re: [PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 3:56 PM, Jacob Keller wrote: >>> + >>> + if (strbuf_read(buf, cp.out, 0) < 0) >> >> So we keep the whole diff in memory >> I don't know much about the diff machinery, but I thought >> the rest of the diff machinery just streams it out? > > Yea, but I can't figure out

Re: [PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 4:10 PM, Stefan Beller wrote: > xread does use a poll() for you so it is not active polling, > but only reading when data is available. s/active polling/ spinning/ > > >>> >>> When not checked out, we can invoke the diff command >>> in .git/modules/ as that is the git dir

[PATCH] http-backend: buffer headers before sending

2016-08-09 Thread Eric Wong
Avoid waking up the readers for unnecessary context switches for each line of header data being written, as all the headers are written in short succession. It is unlikely any HTTP/1.x server would want to read a CGI response one-line-at-a-time and trickle each to the client. Instead, I'd expect H

[PATCH RFC v2] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Jacob Keller
From: Jacob Keller For projects which have frequent updates to submodules it is often useful to be able to see a submodule update commit as a difference. Teach diff's --submodule= a new "diff" format which will execute a diff for the submodule between the old and new commit, and display it as a s

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Josh Triplett
On Tue, Aug 09, 2016 at 06:57:05AM -0400, Jeff King wrote: > On Tue, Aug 09, 2016 at 10:11:30AM +0200, Michael J Gruber wrote: > > > Maybe two more points of input for the discussion: > > > > off-line capabilities > > = > > > > The current workflow here seems to work best whe

Re: [PATCH RFC v2] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-09 Thread Stefan Beller
On Tue, Aug 9, 2016 at 5:23 PM, Jacob Keller wrote: > > +static int prepare_submodule_diff(struct strbuf *buf, const char *path, > + unsigned char one[20], unsigned char two[20]) > +{ This is not used any more, but the child is run directly below? > + strbuf_addf(&submodule_g

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Josh Triplett
On Tue, Aug 09, 2016 at 06:28:00PM +, Eric Wong wrote: > Some of these problems I hope public-inbox (or something like > it) can fix and turn the tide towards email, again. This really seems like the dichotomy that drives people towards central services like GitHub or GitLab. We need an alter

  1   2   >