Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Junio C Hamano
Ben Peart writes: >> Hmm.. this means cache-tree is fully valid, unless you have changes in >> index. We're quite aggressive in repairing cache-tree since aecf567cbf >> (cache-tree: create/update cache-tree on checkout - 2014-07-05). If we >> have very good cache-tree records and still spend 33s

Re: [PATCH] pack-protocol: mention and point to docs for protocol v2

2018-07-23 Thread Jonathan Nieder
Hi, Brandon Williams wrote: > --- a/Documentation/technical/pack-protocol.txt > +++ b/Documentation/technical/pack-protocol.txt > @@ -50,7 +50,8 @@ Each Extra Parameter takes the form of `=` or > ``. > > Servers that receive any such Extra Parameters MUST ignore all > unrecognized keys.

Re: [PATCH] Documentation/diff-options: explain different diff algorithms

2018-07-23 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > As a user I wondered what the diff algorithms are about. Offer at least > a basic explanation on the differences of the diff algorithms. Interesting. Let's see. [...] > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -94,16 +94,34 @@

Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Jeff King
On Mon, Jul 23, 2018 at 07:03:16PM +0200, Duy Nguyen wrote: > > > Try bumping core.deltaBaseCacheLimit to see if that has any impact. It's > > > 96MB by default. > > > > > > There may also be some possible work in making it more aggressive about > > > storing the intermediate results. I seem to

Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Jeff King
On Mon, Jul 23, 2018 at 04:51:38PM -0400, Ben Peart wrote: > > Hmm.. this means cache-tree is fully valid, unless you have changes in > > index. We're quite aggressive in repairing cache-tree since aecf567cbf > > (cache-tree: create/update cache-tree on checkout - 2014-07-05). If we > > have very

Re: refs/notes/amlog problems, was Re: [PATCH v3 01/20] linear-assignment: a function to solve least-cost assignment problems

2018-07-23 Thread Junio C Hamano
Jeff King writes: > If I understand the situation correctly, Junio is saying that he will > continue to produce the amlog mapping, and that it contains sufficient > information to produce the reverse mapping (which, as an aside, I did > not even know existed -- I mostly want to go the other way,

Re: [PATCH v4 16/21] range-diff --dual-color: fix bogus white-space warning

2018-07-23 Thread Junio C Hamano
Junio C Hamano writes: > It is pleasing to see that with a surprisingly clean and small > change like this we can exempt the initial space byte from > SP-before-HT check and from Indent-with-non-tab at the same time. > > Very nice. > > One reason why a surprisingly small special case is required

[PATCH] Documentation/diff-options: explain different diff algorithms

2018-07-23 Thread Stefan Beller
As a user I wondered what the diff algorithms are about. Offer at least a basic explanation on the differences of the diff algorithms. Signed-off-by: Stefan Beller --- Documentation/diff-options.txt | 32 +--- 1 file changed, 25 insertions(+), 7 deletions(-) diff

Re: [PATCH 07/14] range-diff: respect diff_option.file rather than assuming 'stdout'

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 6:59 PM Stefan Beller wrote: > On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine wrote: > > The actual diffs output by range-diff respect diff_option.file, which > > range-diff passes down the call-chain, thus are destination-agnostic. > > However, output_pair_header() is

Re: [PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Brandon Williams
On 07/23, Junio C Hamano wrote: > Junio C Hamano writes: > > > Brandon Williams writes: > > > >> Signed-off-by: Brandon Williams > >> --- > >> fetch-pack.c | 16 > >> 1 file changed, 8 insertions(+), 8 deletions(-) > > > > I do think this is a good idea, but what release does

Re: [PATCH 07/14] range-diff: respect diff_option.file rather than assuming 'stdout'

2018-07-23 Thread Stefan Beller
On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine wrote: > > The actual diffs output by range-diff respect diff_option.file, which > range-diff passes down the call-chain, thus are destination-agnostic. > However, output_pair_header() is hard-coded to emit to 'stdout'. Fix > this by making

Re: [PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Junio C Hamano
Junio C Hamano writes: > Brandon Williams writes: > >> Signed-off-by: Brandon Williams >> --- >> fetch-pack.c | 16 >> 1 file changed, 8 insertions(+), 8 deletions(-) > > I do think this is a good idea, but what release does this target? > It does not seem to apply to

Re: [PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Junio C Hamano
Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > fetch-pack.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) I do think this is a good idea, but what release does this target? It does not seem to apply to master@{4.hours.ago}, and I do not think a

Re: [PATCH v4 14/21] diff: add an internal option to dual-color diffs of diffs

2018-07-23 Thread Stefan Beller
> > - fputs(diff_line_prefix(o), file); > > + if (first) > > + fputs(diff_line_prefix(o), file); > > + else if (!len) > > + return; > > Can you explain this hunk in the log message? I am not sure how the > description in the log message relates to this change.

Re: [PATCH v4 16/21] range-diff --dual-color: fix bogus white-space warning

2018-07-23 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > @@ -177,8 +178,16 @@ static unsigned ws_check_emit_1(const char *line, int > len, unsigned ws_rule, > if (trailing_whitespace == -1) > trailing_whitespace = len; > > + if ((ws_rule & WS_IGNORE_FIRST_SPACE) && len &&

Re: [PATCH v4 14/21] diff: add an internal option to dual-color diffs of diffs

2018-07-23 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > When diffing diffs, it can be quite daunting to figure out what the heck > is going on, as there are nested +/- signs. > > Let's make this easier by adding a flag in diff_options that allows > color-coding the outer

Re: [PATCH v4 16/21] range-diff --dual-color: fix bogus white-space warning

2018-07-23 Thread Stefan Beller
On Sat, Jul 21, 2018 at 3:05 PM Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > When displaying a diff of diffs, it is possible that there is an outer > `+` before a context line. That happens when the context changed between > old and new commit. When that context

Re: [PATCH v4 00/21] Add `range-diff`, a `tbdiff` lookalike

2018-07-23 Thread Junio C Hamano
Stefan Beller writes: > On Sat, Jul 21, 2018 at 3:04 PM Johannes Schindelin via GitGitGadget > wrote: > >> Side note: I work on implementing range-diff not only to make life easier >> for reviewers who have to suffer through v2, v3, ... of my patch series, but >> also to verify my changes

Re: [PATCH 1/9] contrib: add a script to initialize VS Code configuration

2018-07-23 Thread Junio C Hamano
Junio C Hamano writes: > "Johannes Schindelin via GitGitGadget" > writes: > >> diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh >> new file mode 100755 >> index 0..3cc93243f >> --- /dev/null >> +++ b/contrib/vscode/init.sh >> @@ -0,0 +1,165 @@ >> +#!/bin/sh > > This is caued

Re: [PATCH] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Jeff King
On Sat, Jul 21, 2018 at 06:23:32AM +0200, Duy Nguyen wrote: > > I'm not sure I completely agree with this. While 4GB deltas should be > > pretty rare, the nice thing about 64-bit is that you never have to even > > think about whether the variable is large enough. I think the 2^32 > > limitations

Re: [PATCH 02/14] format-patch: add --interdiff option to embed diff in cover letter

2018-07-23 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Jul 23, 2018 at 12:03 PM Duy Nguyen wrote: >> On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine >> wrote: >> > @@ -0,0 +1,17 @@ >> > +void show_interdiff(struct rev_info *rev) >> > +{ >> > + struct diff_options opts; >> > + >> > + memcpy(, >diffopt,

Re: [PATCH 1/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Junio C Hamano
Stefan Beller writes: > This test was last touched in c66410ed32a (submodule init: > redirect stdout to stderr, 2016-05-02), merged as f2c96ceb57a > (Merge branch 'sb/submodule-init', 2016-05-17) > > The parallelizing effort was made before that > (2335b870fa7 (submodule update: expose

Re: [PATCH v2] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Jeff King
On Mon, Jul 23, 2018 at 08:49:59PM +0200, Duy Nguyen wrote: > On Mon, Jul 23, 2018 at 8:38 PM Duy Nguyen wrote: > > I will have to study the thread dispatch code more to have a better > > answer, unfortunately. > > Well.. I thought I would need this weekend for this, but a quick look > and

Re: [PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Jonathan Nieder
Brandon Williams wrote: > Signed-off-by: Brandon Williams > --- > fetch-pack.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Jonathan Nieder Thanks.

Re: [PATCH v6 8/8] fetch-pack: implement ref-in-want

2018-07-23 Thread Jonathan Nieder
Hi, Duy Nguyen wrote: > On Mon, Jul 23, 2018 at 7:53 PM Brandon Williams wrote: >> What criteria is used to determine if something should be translated? [...] > Besides drawing the line "benefit from (not) being translated" varies > from one developer to another. I think it's just easier and

Re: [PATCH v4 11/21] range-diff: add tests

2018-07-23 Thread Stefan Beller
> +test_expect_success 'simple B...C (unmodified)' ' > + git range-diff --no-color I wonder if we want to have tests for colors, too, eventually. (Feel free to push back on it or put it into the left over hashtag. But given how much time we (or I) spent discussing colors, this would be a

Re: [PATCH v4 00/21] Add `range-diff`, a `tbdiff` lookalike

2018-07-23 Thread Stefan Beller
On Sat, Jul 21, 2018 at 3:04 PM Johannes Schindelin via GitGitGadget wrote: > Side note: I work on implementing range-diff not only to make life easier for > reviewers who have to suffer through v2, v3, ... of my patch series, but also > to verify my changes before submitting a new iteration.

Re: [PATCH 1/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Stefan Beller
On Mon, Jul 23, 2018 at 12:14 PM Junio C Hamano wrote: > > "Johannes Schindelin via GitGitGadget" > writes: > > > To prevent such false positives from unnecessarily costing time when > > investigating test failures, let's take the exact order of the lines out > > of the equation by sorting them

Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Ben Peart
On 7/23/2018 1:03 PM, Duy Nguyen wrote: On Mon, Jul 23, 2018 at 5:50 PM Ben Peart wrote: Anyway, on to the actual discussion: Here is a checkout command with tracing turned on to demonstrate where the time is spent. Note, this is somewhat of a �best case� as I�m simply checking out the

Re: [PATCH v2 17/18] commit-reach: make can_all_from_reach... linear

2018-07-23 Thread Jonathan Tan
> + if (parse_commit(list[i]) || > + list[i]->generation < min_generation) Here... > + if (parse_commit(parent->item) || > + parent->item->date < > min_commit_date || > +

Re: [PATCH v2 15/18] test-reach: test commit_contains

2018-07-23 Thread Jonathan Tan
> + } else if (!strcmp(av[1], "commit_contains")) { > + struct ref_filter filter; > + struct contains_cache cache; > + init_contains_cache(); > + > + if (ac > 2 && !strcmp(av[2], "--tag")) > + filter.with_commit_tag_algo = 1;

Re: [PATCH 00/14] format-patch: add --interdiff and --range-diff options

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 12:32 PM Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine > wrote: > > When re-submitting a patch series, it is often helpful (for reviewers) > > to include an interdiff or range-diff against the previous version. > > Doing so requires manually running

Re: [PATCH 10/14] format-patch: add --range-diff option to embed diff in cover letter

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 12:28 PM Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine > wrote: > > diff --git a/Documentation/git-format-patch.txt > > b/Documentation/git-format-patch.txt > > index f8a061794d..e7f404be3d 100644 > > --- a/Documentation/git-format-patch.txt > > +++

Re: [PATCH 1/9] contrib: add a script to initialize VS Code configuration

2018-07-23 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh > new file mode 100755 > index 0..3cc93243f > --- /dev/null > +++ b/contrib/vscode/init.sh > @@ -0,0 +1,165 @@ > +#!/bin/sh This is caued by our usual "git apply

Re: [PATCH 06/14] format-patch: allow --interdiff to apply to a lone-patch

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 12:22 PM Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine > wrote: > > + if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) { > > OK putting idiff stuff in rev_info is probably the right choice. But > we all three fields prefixed with idiff_, maybe

Re: [PATCH 0/5] Misc Coccinelle-related improvements

2018-07-23 Thread Junio C Hamano
SZEDER Gábor writes: > Just a couple of minor Coccinelle-related improvements: > > - The first two patches are small cleanups. > > - The last three could make life perhaps just a tad bit easier for > devs running 'make coccicheck'. Thanks. All 5 patches make sense. Queued.

Re: [PATCH 2/5] coccinelle: use $(addsuffix) in 'coccicheck' make target

2018-07-23 Thread Junio C Hamano
SZEDER Gábor writes: > The dependencies of the 'coccicheck' make target are listed with the > help of the $(patsubst) make function, which in this case doesn't do > any pattern substitution, but only adds the '.patch' suffix. > > Use the shorter and more idiomatic $(addsuffix) make function

Re: [PATCH 1/5] coccinelle: mark the 'coccicheck' make target as .PHONY

2018-07-23 Thread Junio C Hamano
SZEDER Gábor writes: > The 'coccicheck' target doesn't create a file with the same name, so > mark it as .PHONY. > > Signed-off-by: SZEDER Gábor > --- Good. It is customary to do so immediately before the target, not after a blank line, though. > Makefile | 2 ++ > 1 file changed, 2

Re: [PATCH 03/14] format-patch: teach --interdiff to respect -v/--reroll-count

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 12:12 PM Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine > wrote: > > @@ -215,6 +215,7 @@ struct rev_info { > > /* interdiff */ > > const struct object_id *idiff_oid1; > > const struct object_id *idiff_oid2; > > + const

Re: [PATCH 02/14] format-patch: add --interdiff option to embed diff in cover letter

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 12:03 PM Duy Nguyen wrote: > On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine > wrote: > > @@ -0,0 +1,17 @@ > > +void show_interdiff(struct rev_info *rev) > > +{ > > + struct diff_options opts; > > + > > + memcpy(, >diffopt, sizeof(opts)); > > +

Re: [PATCH 1/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > To prevent such false positives from unnecessarily costing time when > investigating test failures, let's take the exact order of the lines out > of the equation by sorting them before comparing them. > ... > cat +Cloning into

Re: [PATCH] l10n: de.po: translate 108 new messages

2018-07-23 Thread Matthias Rüster
Acked-by: Matthias Rüster Thanks! Am 19.07.2018 um 19:15 schrieb Ralf Thielow: Translate 108 new messages came from git.pot update in 9b7388a85 (l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 373

Re: [PATCH 0/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > This fixes a regression test that produces false positives occasionally: > https://git-for-windows.visualstudio.com/git/_build/results?buildId=14035=logs > [jc: forwrding to Torsten for <208b2ede-4833-f062-16f2-f35b8a8ce...@web.de>] > Johannes

Re: [PATCH 3/5] coccinelle: exclude sha1dc source files from static analysis

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 2:44 PM SZEDER Gábor wrote: > On Mon, Jul 23, 2018 at 8:28 PM Eric Sunshine wrote: > > On Mon, Jul 23, 2018 at 9:51 AM SZEDER Gábor wrote: > > > +ifdef DC_SHA1_SUBMODULE > > > +COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES)) > > > +else > > >

Re: [PATCH v2] Makefile: add a DEVOPTS flag to get pedantic compilation

2018-07-23 Thread Junio C Hamano
Beat Bolli writes: > In the interest of code hygiene, make it easier to compile Git with the > flag -pedantic. > > Pure pedantic compilation with GCC 7.3 results in one warning per use of > the translation macro `N_`: > > warning: array initialized from parenthesized string constant

Re: [RFC PATCH 3/5] pack-objects: add delta-islands support

2018-07-23 Thread Stefan Beller
On Sat, Jul 21, 2018 at 10:49 PM Christian Couder wrote: > > From: Jeff King > > Implement support for delta islands in git pack-objects > and document how delta islands work in > "Documentation/git-pack-objects.txt". > > Signed-off-by: Jeff King > Signed-off-by: Christian Couder > --- >

Re: [PATCH] Makefile: add a DEVOPTS flag to get pedantic compilation

2018-07-23 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> +CFLAGS += -pedantic >> +# don't warn for each N_ use >> +CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0 >> +endif > > ...and set this to "no" not "0" since we document that that's the way to > toggle it off in the Makefile, i.e. let's be consistent. The Make

Re: [PATCH v2] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 8:38 PM Duy Nguyen wrote: > I will have to study the thread dispatch code more to have a better > answer, unfortunately. Well.. I thought I would need this weekend for this, but a quick look and ll_find_deltas() suggests that what we're doing is safe. At least you and

Re: [PATCH 3/5] coccinelle: exclude sha1dc source files from static analysis

2018-07-23 Thread SZEDER Gábor
On Mon, Jul 23, 2018 at 8:28 PM Eric Sunshine wrote: > > On Mon, Jul 23, 2018 at 9:51 AM SZEDER Gábor wrote: > > sha1dc is an external library, that we carry in-tree for convenience > > or grab as a submodule, so there is no use in applying our semantic > > patches to its source files. > > > >

Re: [PATCH v2] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 8:04 PM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > Access to e->delta_size_ (and by extension > > pack->delta_size[e - pack->objects]) is unprotected as before, the > > thread scheduler in pack-objects must make sure "e" is never updated > > by two

Re: Hash algorithm analysis

2018-07-23 Thread Jonathan Nieder
Hi Yves, demerphq wrote: > On Sun, 22 Jul 2018 at 01:59, brian m. carlson > wrote: >> I will admit that I don't love making this decision by myself, because >> right now, whatever I pick, somebody is going to be unhappy. [...] > I do not envy you this decision. > > Personally I would aim

Re: [PATCH 3/5] coccinelle: exclude sha1dc source files from static analysis

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 9:51 AM SZEDER Gábor wrote: > sha1dc is an external library, that we carry in-tree for convenience > or grab as a submodule, so there is no use in applying our semantic > patches to its source files. > > Therefore, exclude sha1dc's source files from Coccinelle's static >

Re: Hash algorithm analysis

2018-07-23 Thread Linus Torvalds
On Mon, Jul 23, 2018 at 5:48 AM Sitaram Chamarty wrote: > > I would suggest (a) hash size of 256 bits and (b) choice of any hash > function that can produce such a hash. If people feel strongly that 256 > bits may also turn out to be too small (really?) then a choice of 256 or > 512, but not

Re: [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout

2018-07-23 Thread Ben Peart
On 7/23/2018 2:09 PM, Eric Sunshine wrote: On Mon, Jul 23, 2018 at 9:12 AM Ben Peart wrote: On 7/21/2018 3:21 AM, Eric Sunshine wrote: On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren wrote: + rm .git/info/sparse-checkout Should this cleanup be done by test_when_finished()? I

Re: What's cooking in git.git (Jul 2018, #02; Wed, 18)

2018-07-23 Thread Jonathan Tan
> Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. What do you think about

Re: [PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Stefan Beller
On Mon, Jul 23, 2018 at 10:56 AM Brandon Williams wrote: > fetch-pack is listed as a plumbing command, which means its prime consumer is supposedly a machine; But fetch-pack is also used by git-fetch that is invoked by a human, who prefers translations. .. goes reads code... This translates

Re: [PATCH v6 8/8] fetch-pack: implement ref-in-want

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 7:53 PM Brandon Williams wrote: > > On 07/22, Duy Nguyen wrote: > > On Thu, Jun 28, 2018 at 12:33 AM Brandon Williams wrote: > > > +static void receive_wanted_refs(struct packet_reader *reader, struct ref > > > *refs) > > > +{ > > > + process_section_header(reader,

Re: [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout

2018-07-23 Thread Junio C Hamano
Ben Peart writes: > On 7/21/2018 2:34 AM, Elijah Newren wrote: >> From: Ben Peart >> >> Signed-off-by: Elijah Newren >> --- >> Testcase provided by Ben, so committing with him as the author. Just need >> a sign off from him. > > Thanks Elijah, consider it > > Signed-off-by: Ben Peart >

Re: [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout

2018-07-23 Thread Eric Sunshine
On Mon, Jul 23, 2018 at 9:12 AM Ben Peart wrote: > On 7/21/2018 3:21 AM, Eric Sunshine wrote: > > On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren wrote: > >> + rm .git/info/sparse-checkout > > > > Should this cleanup be done by test_when_finished()? > > I think trying to use

Re: [PATCH v2] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Access to e->delta_size_ (and by extension > pack->delta_size[e - pack->objects]) is unprotected as before, the > thread scheduler in pack-objects must make sure "e" is never updated > by two different threads. OK. Do we need to worry about "e" (e.g.

Re: Hash algorithm analysis

2018-07-23 Thread Stefan Beller
On Mon, Jul 23, 2018 at 5:41 AM demerphq wrote: > > On Sun, 22 Jul 2018 at 01:59, brian m. carlson > wrote: > > I will admit that I don't love making this decision by myself, because > > right now, whatever I pick, somebody is going to be unhappy. I want to > > state, unambiguously, that I'm

[PATCH] fetch-pack: mark die strings for translation

2018-07-23 Thread Brandon Williams
Signed-off-by: Brandon Williams --- fetch-pack.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 0b4a9f288f..51abee6181 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1245,13 +1245,13 @@ static int

Re: [PATCH v6 8/8] fetch-pack: implement ref-in-want

2018-07-23 Thread Brandon Williams
On 07/22, Duy Nguyen wrote: > On Thu, Jun 28, 2018 at 12:33 AM Brandon Williams wrote: > > +static void receive_wanted_refs(struct packet_reader *reader, struct ref > > *refs) > > +{ > > + process_section_header(reader, "wanted-refs", 0); > > + while (packet_reader_read(reader) ==

[PATCH] pack-protocol: mention and point to docs for protocol v2

2018-07-23 Thread Brandon Williams
Signed-off-by: Brandon Williams --- Documentation/technical/pack-protocol.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index 7fee6b780a..25acd9edb1 100644 ---

Re: [PATCH 2/9] vscode: hard-code a couple defines

2018-07-23 Thread Jonathan Nieder
Hi, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines > are passed to GCC *only* when compiling specific files, such as git.o. > > Let's just hard-code them into the script for the time being.

Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 5:50 PM Ben Peart wrote: > > Anyway, on to the actual discussion: > > > >> Here is a checkout command with tracing turned on to demonstrate where the > >> time is spent. Note, this is somewhat of a �best case� as I�m simply > >> checking out the current commit: > >> > >>

Re: t7406-submodule-update shaky ?

2018-07-23 Thread Stefan Beller
On Sun, Jul 22, 2018 at 2:05 PM Torsten Bögershausen wrote: > > It seems that t7406 is sometimes shaky - when checking stderr in test > case 4. > > The order of the submodules may vary, sorting the stderr output makes it > > more reliable (and somewhat funny to read). > > Does anybody have a

Re: [PATCH 1/9] contrib: add a script to initialize VS Code configuration

2018-07-23 Thread Jonathan Nieder
Hi, Thanks for working on this. Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > VS Code is a lightweight but powerful source code editor which runs on > your desktop and is available for Windows, macOS and Linux. Among other > languages, it has support for C/C++ via

Re: [PATCH 00/14] format-patch: add --interdiff and --range-diff options

2018-07-23 Thread Duy Nguyen
On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine wrote: > > When re-submitting a patch series, it is often helpful (for reviewers) > to include an interdiff or range-diff against the previous version. > Doing so requires manually running git-diff or git-range-diff and > copy/pasting the result into

Re: [PATCH 0/5] Misc Coccinelle-related improvements

2018-07-23 Thread René Scharfe
Am 23.07.2018 um 15:50 schrieb SZEDER Gábor: > Just a couple of minor Coccinelle-related improvements: > >- The first two patches are small cleanups. > >- The last three could make life perhaps just a tad bit easier for > devs running 'make coccicheck'. > > > SZEDER Gábor (5): >

Re: [PATCH 10/14] format-patch: add --range-diff option to embed diff in cover letter

2018-07-23 Thread Duy Nguyen
On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine wrote: > diff --git a/Documentation/git-format-patch.txt > b/Documentation/git-format-patch.txt > index f8a061794d..e7f404be3d 100644 > --- a/Documentation/git-format-patch.txt > +++ b/Documentation/git-format-patch.txt > @@ -24,6 +24,7 @@ SYNOPSIS

Re: [PATCH 06/14] format-patch: allow --interdiff to apply to a lone-patch

2018-07-23 Thread Duy Nguyen
On Sun, Jul 22, 2018 at 11:58 AM Eric Sunshine wrote: > diff --git a/log-tree.c b/log-tree.c > index 9d38f1cf79..56513fa83d 100644 > --- a/log-tree.c > +++ b/log-tree.c > @@ -14,6 +14,7 @@ > #include "sequencer.h" > #include "line-log.h" > #include "help.h" > +#include "interdiff.h" > >

Re: [PATCH 03/14] format-patch: teach --interdiff to respect -v/--reroll-count

2018-07-23 Thread Duy Nguyen
On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine wrote: > > The --interdiff option introduces the embedded interdiff generically as > "Interdiff:", however, we can do better when --reroll-count is specified Oh boy. --reroll-count was added in 2012 and here I am typing --subject-prefix='PATCH vX'

Re: [PATCH 02/14] format-patch: add --interdiff option to embed diff in cover letter

2018-07-23 Thread Duy Nguyen
On Sun, Jul 22, 2018 at 11:57 AM Eric Sunshine wrote: > diff --git a/interdiff.c b/interdiff.c > new file mode 100644 > index 00..d0fac10c7c > --- /dev/null > +++ b/interdiff.c > @@ -0,0 +1,17 @@ > +#include "cache.h" > +#include "commit.h" > +#include "revision.h" > +#include

Re: [PATCH] pack-objects: fix performance issues on packing large deltas

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 2:34 PM Elijah Newren wrote: > This patch provides a stop-gap improvement for maint that increases the > delta size back up to 32 bits (still an improvement over the 64 bit size > of the original). The "still an improvement" is actually not true. Due to padding and stuff,

Re: [PATCH v1 0/3] [RFC] Speeding up checkout (and merge, rebase, etc)

2018-07-23 Thread Ben Peart
On 7/18/2018 5:34 PM, Jeff King wrote: On Wed, Jul 18, 2018 at 08:45:14PM +, Ben Peart wrote: When working directories get big, checkout times start to suffer. Even with GVFS virtualization (which limits git to only having to update those files that have been changed locally) we�re

Re: [PATCH 0/5] Misc Coccinelle-related improvements

2018-07-23 Thread Duy Nguyen
On Mon, Jul 23, 2018 at 3:51 PM SZEDER Gábor wrote: > > Just a couple of minor Coccinelle-related improvements: > > - The first two patches are small cleanups. > > - The last three could make life perhaps just a tad bit easier for > devs running 'make coccicheck'. I'm not a heavy cocci

Re: [PATCH 0/5] Misc Coccinelle-related improvements

2018-07-23 Thread Derrick Stolee
On 7/23/2018 9:50 AM, SZEDER Gábor wrote: Just a couple of minor Coccinelle-related improvements: - The first two patches are small cleanups. - The last three could make life perhaps just a tad bit easier for devs running 'make coccicheck'. I appreciate your focus on making 'make

Re: [PATCH 1/5] coccinelle: mark the 'coccicheck' make target as .PHONY

2018-07-23 Thread Derrick Stolee
On 7/23/2018 9:50 AM, SZEDER Gábor wrote: The 'coccicheck' target doesn't create a file with the same name, so mark it as .PHONY. Signed-off-by: SZEDER Gábor --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e4b503d259..27bfc196dd 100644 ---

Re: [PATCH 4/5] coccinelle: put sane filenames into output patches

2018-07-23 Thread Derrick Stolee
On 7/23/2018 9:50 AM, SZEDER Gábor wrote: Coccinelle outputs its suggested transformations as patches, whose header looks something like this: --- commit.c +++ /tmp/cocci-output-19250-7ae78a-commit.c Note the lack of 'diff --opts ' line, the differing number of path components on the

Re: [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary

2018-07-23 Thread Ben Peart
merge-recursive.c | 16 t/t3507-cherry-pick-conflict.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 113c1d696..fd74bca17 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@

[PATCH 3/9] cache.h: extract enum declaration from inside a struct declaration

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin While it is technically possible, it is confusing. Not only the user, but also VS Code's intellisense. Signed-off-by: Johannes Schindelin --- cache.h | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/cache.h b/cache.h

[PATCH 7/9] vscode: use 8-space tabs, no trailing ws, etc for Git's source code

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This adds a couple settings for the .c/.h files so that it is easier to conform to Git's conventions while editing the source code. Signed-off-by: Johannes Schindelin --- contrib/vscode/init.sh | 8 1 file changed, 8 insertions(+) diff --git

[PATCH 5/9] vscode: only overwrite C/C++ settings

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The C/C++ settings are special, as they are the only generated VS Code configurations that *will* change over the course of Git's development, e.g. when a new constant is defined. Therefore, let's only update the C/C++ settings, also to prevent user modifications from

[PATCH 4/9] mingw: define WIN32 explicitly

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This helps VS Code's intellisense to figure out that we want to include windows.h, and that we want to define the minimum target Windows version as Windows Vista/2008R2. Signed-off-by: Johannes Schindelin --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH 9/9] vscode: let cSpell work on commit messages, too

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin By default, the cSpell extension ignores all files under .git/. That includes, unfortunately, COMMIT_EDITMSG, i.e. commit messages. However, spell checking is *quite* useful when writing commit messages... And since the user hardly ever opens any file inside .git (apart

[PATCH 8/9] vscode: add a dictionary for cSpell

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The quite useful cSpell extension allows VS Code to have "squiggly" lines under spelling mistakes. By default, this would add too much clutter, though, because so much of Git's source code uses words that would trigger cSpell. Let's add a few words to make the spell

[PATCH 6/9] vscode: wrap commit messages at column 72 by default

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When configuring VS Code as core.editor (via `code --wait`), we really want to adhere to the Git conventions of wrapping commit messages. Signed-off-by: Johannes Schindelin --- contrib/vscode/init.sh | 4 1 file changed, 4 insertions(+) diff --git

[PATCH 0/9] Add support to develop Git in Visual Studio Code

2018-07-23 Thread Johannes Schindelin via GitGitGadget
[Visual Studio Code](https://code.visualstudio.com/) (nickname "VS Code") is a light-weight, cross-platform, Open Source development environment, with an increasingly powerful extension to support C/C++ development. In particular the intellisense support as well as all the other niceties

[PATCH 1/9] contrib: add a script to initialize VS Code configuration

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin VS Code is a lightweight but powerful source code editor which runs on your desktop and is available for Windows, macOS and Linux. Among other languages, it has support for C/C++ via an extension. To start developing Git with VS Code, simply run the Unix shell script

[PATCH 2/9] vscode: hard-code a couple defines

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines are passed to GCC *only* when compiling specific files, such as git.o. Let's just hard-code them into the script for the time being. Signed-off-by: Johannes Schindelin ---

[PATCH 4/5] coccinelle: put sane filenames into output patches

2018-07-23 Thread SZEDER Gábor
Coccinelle outputs its suggested transformations as patches, whose header looks something like this: --- commit.c +++ /tmp/cocci-output-19250-7ae78a-commit.c Note the lack of 'diff --opts ' line, the differing number of path components on the --- and +++ lines, and the nonsensical filename

[PATCH 5/5] coccinelle: extract dedicated make target to clean Coccinelle's results

2018-07-23 Thread SZEDER Gábor
Sometimes I want to remove only Coccinelle's results, but keep all other build artifacts left after my usual 'make all man' build. This new 'cocciclean' make target will allow just that. Signed-off-by: SZEDER Gábor --- Makefile | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[PATCH 3/5] coccinelle: exclude sha1dc source files from static analysis

2018-07-23 Thread SZEDER Gábor
sha1dc is an external library, that we carry in-tree for convenience or grab as a submodule, so there is no use in applying our semantic patches to its source files. Therefore, exclude sha1dc's source files from Coccinelle's static analysis. This change also makes the static analysis somewhat

[PATCH 2/5] coccinelle: use $(addsuffix) in 'coccicheck' make target

2018-07-23 Thread SZEDER Gábor
The dependencies of the 'coccicheck' make target are listed with the help of the $(patsubst) make function, which in this case doesn't do any pattern substitution, but only adds the '.patch' suffix. Use the shorter and more idiomatic $(addsuffix) make function instead. Signed-off-by: SZEDER

[PATCH 1/5] coccinelle: mark the 'coccicheck' make target as .PHONY

2018-07-23 Thread SZEDER Gábor
The 'coccicheck' target doesn't create a file with the same name, so mark it as .PHONY. Signed-off-by: SZEDER Gábor --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e4b503d259..27bfc196dd 100644 --- a/Makefile +++ b/Makefile @@ -2685,6 +2685,8 @@

[PATCH 0/5] Misc Coccinelle-related improvements

2018-07-23 Thread SZEDER Gábor
Just a couple of minor Coccinelle-related improvements: - The first two patches are small cleanups. - The last three could make life perhaps just a tad bit easier for devs running 'make coccicheck'. SZEDER Gábor (5): coccinelle: mark the 'coccicheck' make target as .PHONY

[PATCH 1/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Regression tests are automated tests which try to ensure a specific behavior. The idea is: if the test case fails, the behavior indicated in the test case's title regressed. If a regression test that fails, even occasionally, for any reason other than to indicate the

[PATCH 0/1] t7406: avoid failures solely due to timing issues

2018-07-23 Thread Johannes Schindelin via GitGitGadget
This fixes a regression test that produces false positives occasionally: https://git-for-windows.visualstudio.com/git/_build/results?buildId=14035=logs Johannes Schindelin (1): t7406: avoid failures solely due to timing issues t/t7406-submodule-update.sh | 11 ++- 1 file changed, 6

Reply

2018-07-23 Thread Buka Saraki
Greeting, I contacted you last two weeks and I got no response. I mentioned about my late client that has the same surname with you. He deposited the sum of US$10.5 million dollars in one of the bank here in our country and they have asked me to provide a next of kin.Kindly show your interest to

  1   2   >