Re: [PATCH v4 2/2] pack-objects: Teach it to use reachability bitmap index when generating non-stdout pack too

2016-08-08 Thread Kirill Smelkov
On Mon, Aug 08, 2016 at 09:56:00AM -0400, Jeff King wrote: > On Fri, Jul 29, 2016 at 10:47:46AM +0300, Kirill Smelkov wrote: > > > @@ -2527,7 +2528,7 @@ static int get_object_list_from_bitmap(struct > > rev_info *revs) > > if (prepare_bitmap_walk(revs) < 0) > > return -1; > > >

Re: t0027 racy?

2016-08-08 Thread Jeff King
On Mon, Aug 08, 2016 at 05:05:07PM +0200, 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 Windows machine. > > It appears that t0027 fails rando

t0027 racy?

2016-08-08 Thread Johannes Schindelin
Hi Torsten, 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 Windows machine. It appears that t0027 fails randomly for me, in seemingly random places. Sometimes all 1388 cases pa

Re: [PATCH v4 11/12] convert: add filter..process option

2016-08-08 Thread Jeff King
On Sat, Aug 06, 2016 at 08:19:28PM +0200, Lars Schneider wrote: > > I dunno. It's not _that_ big a deal to code around. I was just surprised > > not to see an up-front status when responding to a request. It seems > > like the normal thing in just about every protocol I've ever used. > > Alright.

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

2016-08-08 Thread Jeff King
On Fri, Jul 29, 2016 at 08:02:51AM -0700, Junio C Hamano wrote: > > So it's possible that the resulting pack > > is not as small as it could be (i.e., we break the chain with a base > > object, but it's possible if we looked that we could have broken the > > chain by making a delta against an exis

Re: [PATCH v4 2/2] pack-objects: Teach it to use reachability bitmap index when generating non-stdout pack too

2016-08-08 Thread Jeff King
On Fri, Jul 29, 2016 at 10:47:46AM +0300, Kirill Smelkov wrote: > @@ -2527,7 +2528,7 @@ static int get_object_list_from_bitmap(struct rev_info > *revs) > if (prepare_bitmap_walk(revs) < 0) > return -1; > > - if (pack_options_allow_reuse() && > + if (pack_options_allo

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

2016-08-08 Thread Jeff King
On Mon, Aug 08, 2016 at 09:50:20AM -0400, Jeff King wrote: > > + git pack-objects --local --stdout --revs >1.pack && > > + git index-pack 1.pack && > > I'd have expected you to use the non-stdout version here. Is this meant > to be independent of your other patch (I think that's OK). Oh, nev

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

2016-08-08 Thread Jeff King
On Mon, Aug 08, 2016 at 03:37:35PM +0300, Kirill Smelkov wrote: > @@ -958,15 +958,30 @@ static int want_object_in_pack(const unsigned char > *sha1, > off_t *found_offset) > { > struct packed_git *p; > + struct packed_git *pack1 = *found_pack; > + int pa

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

2016-08-08 Thread Kirill Smelkov
On Mon, Aug 01, 2016 at 11:17:30AM -0700, Junio C Hamano wrote: > Kirill Smelkov writes: > > > 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_bit

Re: [PATCH] t5533: make it pass on case-sensitive filesystems

2016-08-08 Thread Johannes Schindelin
Hi Peff, On Mon, 8 Aug 2016, Jeff King wrote: > On Fri, Aug 05, 2016 at 04:19:08PM +0200, Johannes Schindelin wrote: > > > > The fix is meant for jk/push-force-with-lease-creation topic, but I > > > had to find it out by the old fashioned way, i.e. running blame for > > > these lines in 'pu' to

Re: [PATCH v9 39/41] apply: change error_routine when silent

2016-08-08 Thread Christian Couder
On Mon, Aug 1, 2016 at 6:58 PM, Stefan Beller wrote: > On Sat, Jul 30, 2016 at 10:25 AM, Christian Couder > wrote: >> + /* This is to save some reporting routines */ > > some? > > In case of a reroll could you be more specific? > Specifically mention that we use these for the > muting/when

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

2016-08-08 Thread Vasco Almeida
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_args(int argc, const char **argv, ar

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

2016-08-08 Thread Vasco Almeida
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 () { create_stash "$stash_msg" $untracked

Re: [PATCH] t5533: make it pass on case-sensitive filesystems

2016-08-08 Thread Jeff King
On Fri, Aug 05, 2016 at 04:19:08PM +0200, Johannes Schindelin wrote: > > The fix is meant for jk/push-force-with-lease-creation topic, but I > > had to find it out by the old fashioned way, i.e. running blame for > > these lines in 'pu' to find eee98e74f9 is the culprit and then > > running "git b

[PATCH 1/3] i18n: setup: mark error messages for translation

2016-08-08 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- setup.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/setup.c b/setup.c index 6d0e0c9..fe572b8 100644 --- a/setup.c +++ b/setup.c @@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset, s

Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-08 Thread Johannes Schindelin
Hi René, On Fri, 5 Aug 2016, René Scharfe wrote: > static void add_strategies(const char *string, unsigned attr) > { > - struct strategy *list = NULL; > - int list_alloc = 0, list_nr = 0, i; > - > - memset(&list, 0, sizeof(list)); > - split_merge_strategies(string, &list, &list_

<    1   2