Bonjour ?

2018-09-05 Thread Michel Martin
Bonjour, Je me présente Mr Michel Martin homme d'affaire français résidant en France . je viens par ce présent mail vous fait part d'une offre de prêt financière allant de 500 EURO à 2.500.000 EURO avec un pourcentage de remboursement du montant s'élevant à 3% remboursable sur le nombre

Mailsplit

2018-09-05 Thread Stephen & Linda Smith
I thought I would use "git mailsplit" to split a mbox file (which downloaded from public inbox) so that I could attemp to resurrect a patch series for from a year ago. The motivation is that I downloaded the series [1] and applied to a tag from about the time period that the patch was sent

[RFC PATCH 3/5] split index: add a test to demonstrate the racy split index problem

2018-09-05 Thread SZEDER Gábor
Ever since the split index feature was introduced [1], refreshing a split index is prone to a variant of the classic racy git problem. There are a couple of unrelated tests in the test suite that occasionally fail when run with 'GIT_TEST_SPLIT_INDEX=yes', but 't1700-split-index.sh', the only test

[PATCH 2/5] t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index

2018-09-05 Thread SZEDER Gábor
The test 'switching trees does not invalidate shared index' in 't0090-cache-tree.sh' is about verifying the behaviour of the split index feature, therefore it should be in full control of when index splitting is performed, like all the tests in 't1700-split-index.sh'. Unset GIT_TEST_SPLIT_INDEX

[PATCH 1/5] t1700-split-index: drop unnecessary 'grep'

2018-09-05 Thread SZEDER Gábor
The test 'disable split index' in 't1700-split-index.sh' runs the following pipeline: cmd | grep | sed s/// Drop that 'grep' from the pipeline, and let 'sed' take over its duties. Signed-off-by: SZEDER Gábor --- t/t1700-split-index.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[RFC PATCH 4/5] t1700-split-index: date back files to avoid racy situations

2018-09-05 Thread SZEDER Gábor
't1700-split-index.sh' checks that the index was split correctly under various circumstances and that all the different ways to turn the split index feature on and off work correctly. To do so, most of its tests use 'test-tool dump-split-index' to see which files have their cache entries in the

[RFC PATCH 5/5] split-index: smudge and add racily clean cache entries to split index

2018-09-05 Thread SZEDER Gábor
Ever since the split index feature was introduced [1], refreshing a split index is prone to a variant of the classic racy git problem. Consider the following sequence of commands updating the split index when the shared index contains a racily clean cache entry, i.e. an entry whose cached stat

[RFC PATCH 0/5] Fix the racy split index problem

2018-09-05 Thread SZEDER Gábor
Ever since the split index feature was introduced, refreshing a split index is prone to a variant of the classic racy git problem, which caused occasional failures in several random test scripts when run with 'GIT_TEST_SPLIT_INDEX=yes'. I won't go into details here, there is plenty of text to be

Hej min kära

2018-09-05 Thread Fru Ursula Alice Walton
Min kära stödmottagare, Jag är säker på att detta mail kommer att komma till dig som en överraskning eftersom vi aldrig har träffat förut och du skulle också fråga varför jag har bestämt mig för att välja dig bland de många internetanvändarna i världen. Exakt kan jag inte säga varför jag har

Re: Git in Outreachy Dec-Mar?

2018-09-05 Thread Jeff King
On Mon, Sep 03, 2018 at 06:36:19AM +0200, Christian Couder wrote: > So here is a landing page for the next Outreachy round: > > https://git.github.io/Outreachy-17/ > > about the microprojects I am not sure which page I should create or improve. Thanks. I signed us up as a community (making me

Re: Git in Outreachy Dec-Mar?

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 09:20:23AM +0200, Christian Couder wrote: > >> Thanks. I think sooner is better for this (for you or anybody else who's > >> interested in mentoring). The application period opens on September > >> 10th, but I think the (still growing) list of projects is already being >

[PATCH v3 2/4] wt-status: rename commitable to committable

2018-09-05 Thread Stephen P. Smith
Fix variable spelling error. Signed-off-by: Stephen P. Smith --- builtin/commit.c | 18 +- wt-status.c | 10 +- wt-status.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 0d9828e29..51ecebbec

[PATCH v3 3/4] t7501: add test of "commit --dry-run --short"

2018-09-05 Thread Stephen P. Smith
Add test for commit with --dry-run --short for a new file of zero length. The test demonstrates that the setting of the committable flag is broken. Signed-off-by: Stephen P. Smith --- t/t7501-commit.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t7501-commit.sh

[PATCH v3 1/4] Move has_unmerged earlier in the file.

2018-09-05 Thread Stephen P. Smith
Move has_unmerged up in the file so that has_unmerged can be called in wt_status_collect where we need to place a merge check. Signed-off-by: Stephen P. Smith --- wt-status.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/wt-status.c

[PATCH v3 4/4] wt-status.c: Set the committable flag in the collect phase.

2018-09-05 Thread Stephen P. Smith
In an update to fix a bug with "commit --dry-run" it was found that the committable flag was broken. The update was, at the time, accepted as it was better than the previous version. [1] Since the setting of the committable flag had been done in wt_longstatus_print_updated, move it to

[PATCH v3 0/4] wt-status.c: commitable flag

2018-09-05 Thread Stephen P. Smith
A couple of years ago, during a patch review Junio found that the commitable bit as implemented in wt-status.c was broken. Stephen P. Smith (4): Move has_unmerged earlier in the file. wt-status: rename commitable to committable t7501: add test of "commit --dry-run --short" wt-status.c:

Re: [PATCH v7 7/7] list-objects-filter: implement filter tree:0

2018-09-05 Thread Matthew DeVore
On Tue, Sep 4, 2018 at 1:44 PM Junio C Hamano wrote: > > Matthew DeVore writes: > > > @@ -50,6 +50,10 @@ static int gently_parse_list_objects_filter( > > return 0; > > } > > > > + } else if (!strcmp(arg, "tree:0")) { > > +

Re: [PATCH 1/2] submodule.c: convert submodule_move_head new argument to object id

2018-09-05 Thread Jonathan Nieder
Stefan Beller wrote: > Subject: submodule.c: convert submodule_move_head new argument to object id Same nit as in https://public-inbox.org/git/20180905233203.ge120...@aiede.svl.corp.google.com/ applies about wondering which subsystem this is in. [...] > --- a/submodule.c > +++ b/submodule.c >

Re: [PATCH 2/2] submodule.c: warn about missing submodule commit in recursive actions

2018-09-05 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > Subject: submodule.c: warn about missing submodule commit in recursive actions Nit: the diff already tells me what file the change is in. What I'd be more interested in is the subsystem or what commands this affects. Does this affect all --recurse-submodules

[PATCH 1/2] submodule.c: convert submodule_move_head new argument to object id

2018-09-05 Thread Stefan Beller
All callers use oid_to_hex to convert the desired oid to a string before calling submodule_move_head. Defer the conversion to the submodule_move_head as it will turn out to be useful in a bit. Signed-off-by: Stefan Beller --- This is also part of the other series sent out yesterday,

[PATCH 2/2] submodule.c: warn about missing submodule commit in recursive actions

2018-09-05 Thread Stefan Beller
By checking if a submodule commit exists before attempting the update we can improve the error message from the error(_("Submodule '%s' could not be updated."), path); to the new and more specific error(_("Submodule '%s' doesn't have commit '%s'"), path, oid_to_hex(new_oid));

Re: [PATCH] diff: allow --recurse-submodules as an synonym for --submodule

2018-09-05 Thread Jonathan Nieder
Stefan Beller wrote: > Many commands have flags to recurse into submodules, which is named > --recurse-submodules. The diff family also has a submodule recursion flag, > but that is named differently. Add a synonym --recurse-submodules, which > means the same as the --submodule flag, such that

Re: [PATCH] submodule.sh update --remote: default to oid instead of master

2018-09-05 Thread Jonathan Nieder
Stefan Beller wrote: > Subject: submodule.sh update --remote: default to oid instead of master Yay! Nit: it wasn't clear to me at first what default this subject line was referring to. Perhaps: submodule update --remote: skip GITLINK update when no branch is set [...] > ---

[PATCH] diff: allow --recurse-submodules as an synonym for --submodule

2018-09-05 Thread Stefan Beller
Many commands have flags to recurse into submodules, which is named --recurse-submodules. The diff family also has a submodule recursion flag, but that is named differently. Add a synonym --recurse-submodules, which means the same as the --submodule flag, such that across all git commands

Re: [PATCH v4 01/12] t: add test functions to translate hash-related values

2018-09-05 Thread brian m. carlson
On Mon, Sep 03, 2018 at 08:01:35PM -0400, Eric Sunshine wrote: > On Mon, Sep 3, 2018 at 7:25 PM brian m. carlson > wrote: > > Add several test functions to make working with various hash-related > > values easier. > > [...] > > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > > @@

[PATCH] submodule.sh update --remote: default to oid instead of master

2018-09-05 Thread Stefan Beller
gitmodules(5) sayeth: submodule..branch A remote branch name for tracking updates in the upstream submodule. If the option is not specified, it defaults to master. This doesn't allow having a "pinned" submodule that should not be updated from upstream. We should change this to

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-05 Thread Derrick Stolee
On 9/5/2018 5:46 PM, Junio C Hamano wrote: Derrick Stolee writes: for (i = 0; i < commits->nr; i++) { + display_progress(progress, i); if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY && commits->list[i]->generation !=

Re: How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted [1] over the weekend. I will add a spelling

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Junio C Hamano
Jeff King writes: >> [1]: >> https://public-inbox.org/git/20180830075431.gf11...@sigill.intra.peff.net/ > > Yeah, I'm not sure which is easier for Junio. I figured by replying > inline, it makes it easy to pick up on top of the others (since it > really does depend on them and should be in the

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Junio C Hamano
Jeff King writes: >> This is what I've come up with to prevent looping aliases. I'm not too >> happy with the number of indentations needed, but this seemed to be the >> easiest way to search an array for a value. > > I think this approach is OK, though I wonder if we'd also be fine with > just:

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-05 Thread Junio C Hamano
Derrick Stolee writes: >>> for (i = 0; i < commits->nr; i++) { >>> + display_progress(progress, i); >>> if (commits->list[i]->generation != GENERATION_NUMBER_INFINITY >>> && >>> commits->list[i]->generation != GENERATION_NUMBER_ZERO) >>>

Re: How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote: > I think that one that is not even in 'pu' hasn't been looked at for > a long time; it is probably a good idea to discard and replace, if > you have something working. I submitted [1] over the weekend. I will add a spelling

Re: How to handle patch series conflicts

2018-09-05 Thread Junio C Hamano
Stephen & Linda Smith writes: > Junio - > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: >> > t7500-commit.sh >> > t7501-commit.sh >> > t7502-commit.sh >> > t7509-commit.sh >> >> These seem to have organically grown and it is very likely that ones >> later introduced were

Re: [PATCH v2 24/24] Rename functions to avoid breaking in-flight topics

2018-09-05 Thread Junio C Hamano
Stefan Beller writes: > Presumably you merge the tip of this series (which contains 24/24) > with the other in-flight topics, that make new uses of > init_revisions(revs, prefix), which 24/24 allows. Going on either > parent side of such a merge will have working commits, that compile. > > So

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 05:50:04AM -0400, Eric Sunshine wrote: > On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote: > > * es/worktree-forced-ops-fix (2018-08-30) 9 commits > > - worktree: delete .git/worktrees if empty after 'remove' > > - worktree: teach 'remove' to override lock when

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 02:38:34PM -0400, Eric Sunshine wrote: > On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin > wrote: > > So let's hear some ideas how to improve the situation, m'kay? > > Just as a reminder, this is the problem I want to solve: I want to run the > > tests in a

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Tim Schumacher
On 05.09.18 19:34, Jeff King wrote: On Wed, Sep 05, 2018 at 10:54:27AM +0200, Tim Schumacher wrote: Aliases can only contain non-alias git commands and their arguments, not other user-defined aliases. Resolving further (nested) aliases is prevented by breaking the loop after the first alias

Re: [PATCH 01/11] multi-pack-index: add 'verify' verb

2018-09-05 Thread Derrick Stolee
On 9/5/2018 2:59 PM, Eric Sunshine wrote: On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget wrote: The multi-pack-index builtin writes multi-pack-index files, and uses a 'write' verb to do so. Add a 'verify' verb that checks this file matches the contents of the pack-indexes it

Re: [PATCH 04/11] multi-pack-index: verify packname order

2018-09-05 Thread Derrick Stolee
On 9/5/2018 3:14 PM, Stefan Beller wrote: On Wed, Sep 5, 2018 at 12:11 PM Derrick Stolee wrote: On 9/5/2018 2:15 PM, Stefan Beller wrote: On Wed, Sep 5, 2018 at 7:46 AM Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The final check we make while loading a multi-pack-index is

Re: [PATCH 2/2] submodule.c: warn about missing submodule git directories

2018-09-05 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > This is the continuation of f2d48994dc1 (submodule.c: submodule_move_head > works with broken submodules, 2017-04-18), which tones down the case of > "broken submodule" in case of a missing git directory of the submodule to > be only a warning. > > Signed-off-by:

Re: [PATCH 04/11] multi-pack-index: verify packname order

2018-09-05 Thread Stefan Beller
On Wed, Sep 5, 2018 at 12:11 PM Derrick Stolee wrote: > > On 9/5/2018 2:15 PM, Stefan Beller wrote: > > On Wed, Sep 5, 2018 at 7:46 AM Derrick Stolee via GitGitGadget > > wrote: > >> From: Derrick Stolee > >> > >> The final check we make while loading a multi-pack-index is that > >> the

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Tim Schumacher
On 05.09.18 19:12, Junio C Hamano wrote: Tim Schumacher writes: @@ -691,17 +693,34 @@ static int run_argv(int *argcp, const char ***argv) /* .. then try the external ones */ execv_dashed_external(*argv); + /* Increase the array size and add the current +

Re: [PATCH 04/11] multi-pack-index: verify packname order

2018-09-05 Thread Derrick Stolee
On 9/5/2018 2:15 PM, Stefan Beller wrote: On Wed, Sep 5, 2018 at 7:46 AM Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The final check we make while loading a multi-pack-index is that the packfile names are in lexicographical order. Make this error be a die() instead. What is

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-09-05 Thread Stefan Beller
On Wed, Sep 5, 2018 at 12:02 PM Sebastian Schuberth wrote: > > On 9/3/2018 11:10 PM, Johannes Schindelin via GitGitGadget wrote: > > > The one sad part about this is the Windows support. Travis lacks it, and we > > work around that by using Visual Studio Team Services (VSTS) indirectly: one > >

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Tim Schumacher
On 05.09.18 17:48, Duy Nguyen wrote: On Wed, Sep 5, 2018 at 10:56 AM Tim Schumacher wrote: Aliases can only contain non-alias git commands and their arguments, not other user-defined aliases. Resolving further (nested) aliases is prevented by breaking the loop after the first alias was

Re: [PATCH 0/9] Offer to run CI/PR builds in Visual Studio Team Services

2018-09-05 Thread Sebastian Schuberth
On 9/3/2018 11:10 PM, Johannes Schindelin via GitGitGadget wrote: The one sad part about this is the Windows support. Travis lacks it, and we work around that by using Visual Studio Team Services (VSTS) indirectly: one phase in Travis would trigger a build, wait for its log, and then paste that

Re: [PATCH 01/11] multi-pack-index: add 'verify' verb

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget wrote: > The multi-pack-index builtin writes multi-pack-index files, and > uses a 'write' verb to do so. Add a 'verify' verb that checks this > file matches the contents of the pack-indexes it replaces. > [...] > Signed-off-by:

Re: [PATCH 2/9] ci/lib.sh: encapsulate Travis-specific things

2018-09-05 Thread Sebastian Schuberth
On 9/3/2018 11:10 PM, Johannes Schindelin via GitGitGadget wrote: +if test -n "$TRAVIS_COMMIT" +then + # We are running within Travis CI Personally, I'd find a check like if test "$TRAVIS" = "true" more speaking (also see [1]). [1]

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Luc Van Oostenryck
On Tue, Sep 04, 2018 at 07:36:43PM -0400, Jeff King wrote: > On Tue, Sep 04, 2018 at 12:38:07PM -0400, Jeff King wrote: > > > > And just to be clear I'm looking forward to a patch from Jeff to fix > > > this since he clearly put more thoughts on this than me. With commit.c > > > being the only

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 5:14 AM Eric Sunshine wrote: > On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote: > > * es/worktree-forced-ops-fix (2018-08-30) 9 commits > This description mischaracterizes what these changes are about. [...] > > So, perhaps rewrite this description like this: > >

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin wrote: > So let's hear some ideas how to improve the situation, m'kay? > Just as a reminder, this is the problem I want to solve: I want to run the > tests in a light-weight manner, with minimal output, and only in case of > an error do I want to

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread SZEDER Gábor
On Wed, Sep 05, 2018 at 06:48:06PM +0200, Duy Nguyen wrote: > On Wed, Sep 5, 2018 at 6:35 PM Junio C Hamano wrote: > > > > Junio C Hamano writes: > > > > > Here are the topics that have been cooking. Commits prefixed with > > > '-' are only in 'pu' (proposed updates) while commits prefixed with

[PATCH] rerere: avoid buffer overrun

2018-09-05 Thread Elijah Newren
check_one_conflict() compares `i` to `active_nr` in two places to avoid buffer overruns, but left out an important third location. Note that this bug probably cannot be triggered in the current codebase. Existing merge strategies have tended not to create entries at stage #1 that do not have a

Re: [PATCH 04/11] multi-pack-index: verify packname order

2018-09-05 Thread Stefan Beller
On Wed, Sep 5, 2018 at 7:46 AM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The final check we make while loading a multi-pack-index is that > the packfile names are in lexicographical order. Make this error > be a die() instead. What is the advantage of having a die()

Re: [PATCH v7 5/7] revision: mark non-user-given objects instead

2018-09-05 Thread Matthew DeVore
On Tue, Sep 4, 2018 at 1:31 PM Junio C Hamano wrote: > > Matthew DeVore writes: > > > diff --git a/revision.h b/revision.h > > index 51189..2d381e636 100644 > > --- a/revision.h > > +++ b/revision.h > > @@ -8,7 +8,11 @@ > > #include "diff.h" > > #include "commit-slab-decl.h" > > > > -/*

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Junio C Hamano
Eric Sunshine writes: > This description mischaracterizes what these changes are about. Thanks for a replacement text; very much appreciated.

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 10:54:27AM +0200, Tim Schumacher wrote: > Aliases can only contain non-alias git commands and their > arguments, not other user-defined aliases. Resolving further > (nested) aliases is prevented by breaking the loop after the > first alias was processed. Git then fails

Re: How to handle patch series conflicts

2018-09-05 Thread Stefan Beller
On Wed, Sep 5, 2018 at 10:25 AM Stephen & Linda Smith wrote: > > Junio - > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > > > t7500-commit.sh > > > t7501-commit.sh > > > t7502-commit.sh > > > t7509-commit.sh > > > > These seem to have organically grown and it is very

[PATCH 0/2] --no-deref and --stdin compatibility for update-ref

2018-09-05 Thread Elijah Newren
Currently, the --no-deref and --stdin options of update-ref cannot be used together (the code aborts immediately with a usage message), though it makes sense to do so and is easier than repeatedly specifying on stdin that each ref should not be dereferenced. Also, the documentation for the

[PATCH 2/2] update-ref: allow --no-deref with --stdin

2018-09-05 Thread Elijah Newren
If passed both --no-deref and --stdin, update-ref would error out with a general usage message that did not at all suggest these options were incompatible. The manpage for update-ref did suggest through its synopsis line that --no-deref and --stdin were incompatible, but it sadly also incorrectly

[PATCH 1/2] update-ref: fix type of update_flags variable to match its usage

2018-09-05 Thread Elijah Newren
The ref_transaction_*() family of functions expect a flags parameter which is of type unsigned int. Make the update_flags variable, which is passed as that parameter, be of the same type. Signed-off-by: Elijah Newren --- builtin/update-ref.c | 2 +- 1 file changed, 1 insertion(+), 1

How to handle patch series conflicts

2018-09-05 Thread Stephen & Linda Smith
Junio - On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > > t7500-commit.sh > > t7501-commit.sh > > t7502-commit.sh > > t7509-commit.sh > > These seem to have organically grown and it is very likely that ones > later introduced were added more from laziness. How does the

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Junio C Hamano
Tim Schumacher writes: > @@ -691,17 +693,34 @@ static int run_argv(int *argcp, const char ***argv) > /* .. then try the external ones */ > execv_dashed_external(*argv); > > + /* Increase the array size and add the current > + * command to

Re: [PATCH] merge-recursive: remove superfluous semicolon

2018-09-05 Thread Elijah Newren
On Wed, Sep 5, 2018 at 9:55 AM Duy Nguyen wrote: > > On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren wrote: > > > > Signed-off-by: Elijah Newren > > --- > > Once I saw it, I couldn't unsee it, and it quickly started getting on my > > nerves... > > Bad Elijah! Should have grepped and fixed all

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Junio C Hamano
Jeff King writes: > On Wed, Sep 05, 2018 at 09:54:42AM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> >> > So AFAIK this fsck catches everything and yields a non-zero exit in the >> >> > error case. And it should work for even a single byte of rubbish. >> >> >> >> Yes you're right.

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 09:54:42AM -0700, Junio C Hamano wrote: > Jeff King writes: > > >> > So AFAIK this fsck catches everything and yields a non-zero exit in the > >> > error case. And it should work for even a single byte of rubbish. > >> > >> Yes you're right. I forgot about the trailing

Re: [PATCH] merge-recursive: remove superfluous semicolon

2018-09-05 Thread Duy Nguyen
On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren wrote: > > Signed-off-by: Elijah Newren > --- > Once I saw it, I couldn't unsee it, and it quickly started getting on my > nerves... Bad Elijah! Should have grepped and fixed all three ;-) $ git grep ';;$' -- '*.c' builtin/receive-pack.c:

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Junio C Hamano
Jeff King writes: >> > So AFAIK this fsck catches everything and yields a non-zero exit in the >> > error case. And it should work for even a single byte of rubbish. >> >> Yes you're right. I forgot about the trailing hash. > > Thanks, I was worried that I was missing something. ;) > > Maybe it

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Duy Nguyen
On Wed, Sep 5, 2018 at 6:35 PM Junio C Hamano wrote: > > Junio C Hamano writes: > > > 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

[PATCH] merge-recursive: remove superfluous semicolon

2018-09-05 Thread Elijah Newren
Signed-off-by: Elijah Newren --- Once I saw it, I couldn't unsee it, and it quickly started getting on my nerves... My bad for not noticing it when reviewing the original patch that introduced it, I guess -- 9da2d0379ea0 ("merge-recursive: use xstrdup() instead of fixed buffer", 2018-06-10)

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Sep 5, 2018 at 4:29 AM Ævar Arnfjörð Bjarmason > wrote: >> I recently gained access to a Solaris 10 SPARC (5.10) box and discovered >> that the chainlint.sed implementation in 2.19.0 has more sed portability >> issues. >> >> First, whoever implemented the

Re: jc/rebase-in-c-9-fixes, was Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Junio C Hamano
Johannes Schindelin writes: > On Tue, 4 Sep 2018, Junio C Hamano wrote: > >> * jc/rebase-in-c-9-fixes (2018-09-04) 1 commit >> - rebase: re-add forgotten -k that stands for --keep-empty >> (this branch uses ag/rebase-i-in-c, >> js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, >>

Re: Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-05 Thread Junio C Hamano
Johannes Schindelin writes: > On Tue, 4 Sep 2018, Junio C Hamano wrote: > >> "Johannes Schindelin via GitGitGadget" >> writes: >> >> > + test_must_fail git -c core.editor="grep -q ^pick" \ >> > + rebase -ki --autosquash HEAD~4 && >> >> When merged to 'pu', this reveals that "git

Re: [PATCH 1/8] trace2: create new combined trace facility

2018-09-05 Thread Jeff Hostetler
On 9/4/2018 6:30 PM, Junio C Hamano wrote: Stefan Beller writes: The API defines both fixed-field and printf-style functions. The trace2 performance tracing includes thread-specific function nesting and timings. So this only adds the new API, and we need to merge the TRACE into the

Re: [RFC PATCH v2] Allow aliases that include other aliases

2018-09-05 Thread Duy Nguyen
On Wed, Sep 5, 2018 at 10:56 AM Tim Schumacher wrote: > > Aliases can only contain non-alias git commands and their > arguments, not other user-defined aliases. Resolving further > (nested) aliases is prevented by breaking the loop after the > first alias was processed. Git then fails with a

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 05:39:19PM +0200, Duy Nguyen wrote: > On Wed, Sep 5, 2018 at 5:35 PM Jeff King wrote: > > > > + after=$(wc -c <.git/index) && > > > > + > > > > + # double check that the index shrank > > > > + test $before -gt $after && > > > > + > > > > + # and

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Duy Nguyen
On Wed, Sep 5, 2018 at 5:35 PM Jeff King wrote: > > > + after=$(wc -c <.git/index) && > > > + > > > + # double check that the index shrank > > > + test $before -gt $after && > > > + > > > + # and that our index was not corrupted > > > + git fsck > > > > If the index

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Jeff King
On Wed, Sep 05, 2018 at 05:27:11PM +0200, Duy Nguyen wrote: > > +test_expect_success PERL 'commit -p with shrinking cache-tree' ' > > + mkdir -p deep/subdir && > > + echo content >deep/subdir/file && > > + git add deep && > > + git commit -m add && > > + git rm -r

Re: [PATCH] reopen_tempfile(): truncate opened file

2018-09-05 Thread Duy Nguyen
On Wed, Sep 5, 2018 at 1:36 AM Jeff King wrote: > It turned out not to be too bad to write a test. It feels a little like > black magic, since I empirically determined a way in which the > cache-tree happens to shrink with the current code. Aha! I attempted to reproduce with a verylongpathname

Re: [PATCH 1/8] trace2: create new combined trace facility

2018-09-05 Thread Jeff Hostetler
On 9/4/2018 6:12 PM, Stefan Beller wrote: Create GIT_TR2 trace-key to replace GIT_TRACE, GIT_TR2_PERFORMANCE to replace GIT_TRACE_PERFORMANCE, and a new trace-key GIT_TR2_EVENT to generate JSON data for telemetry purposes. Other structured formats can easily be added later using this new

[PATCH 11/11] fsck: verify multi-pack-index

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When core.multiPackIndex is true, we may have a multi-pack-index in our object directory. Add calls to 'git multi-pack-index verify' at the end of 'git fsck' if so. Signed-off-by: Derrick Stolee --- builtin/fsck.c | 18 ++

[PATCH 10/11] multi-pack-index: report progress during 'verify'

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When verifying a multi-pack-index, the only action that takes significant time is checking the object offsets. For example, to verify a multi-pack-index containing 6.2 million objects in the Linux kernel repository takes 1.3 seconds on my machine. 99% of that time is spent

[PATCH 03/11] multi-pack-index: verify corrupt chunk lookup table

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Signed-off-by: Derrick Stolee --- midx.c | 3 +++ t/t5319-multi-pack-index.sh | 13 + 2 files changed, 16 insertions(+) diff --git a/midx.c b/midx.c index ec78254bb6..8b054b39ab 100644 --- a/midx.c +++ b/midx.c @@ -100,6 +100,9 @@ struct

[PATCH 07/11] multi-pack-index: verify oid lookup order

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Signed-off-by: Derrick Stolee --- midx.c | 11 +++ t/t5319-multi-pack-index.sh | 8 2 files changed, 19 insertions(+) diff --git a/midx.c b/midx.c index dfd26b4d74..06d5cfc826 100644 --- a/midx.c +++ b/midx.c @@ -959,5 +959,16 @@ int

[PATCH 09/11] multi-pack-index: verify object offsets

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The 'git multi-pack-index verify' command must verify the object offsets stored in the multi-pack-index are correct. There are two ways the offset chunk can be incorrect: the pack-int-id and the object offset. Replace the BUG() statement with a die() statement, now that we

[PATCH 08/11] multi-pack-index: fix 32-bit vs 64-bit size check

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When loading a 64-bit offset, we intend to check that off_t can store the resulting offset. However, the condition accidentally checks the 32-bit offset to see if it is smaller than a 64-bit value. Fix it, and this will be covered by a test in the 'git multi-pack-index

[PATCH 06/11] multi-pack-index: verify oid fanout order

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Signed-off-by: Derrick Stolee --- midx.c | 9 + t/t5319-multi-pack-index.sh | 8 2 files changed, 17 insertions(+) diff --git a/midx.c b/midx.c index a02b19efc1..dfd26b4d74 100644 --- a/midx.c +++ b/midx.c @@ -950,5 +950,14 @@ int

[PATCH 05/11] multi-pack-index: verify missing pack

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Signed-off-by: Derrick Stolee --- midx.c | 16 t/t5319-multi-pack-index.sh | 5 + 2 files changed, 21 insertions(+) diff --git a/midx.c b/midx.c index e655a15aed..a02b19efc1 100644 --- a/midx.c +++ b/midx.c @@ -926,13 +926,29 @@

[PATCH 04/11] multi-pack-index: verify packname order

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The final check we make while loading a multi-pack-index is that the packfile names are in lexicographical order. Make this error be a die() instead. In order to test this condition, we need multiple packfiles. Earlier in t5319-multi-pack-index.sh, we tested the interaction

[PATCH 01/11] multi-pack-index: add 'verify' verb

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The multi-pack-index builtin writes multi-pack-index files, and uses a 'write' verb to do so. Add a 'verify' verb that checks this file matches the contents of the pack-indexes it replaces. The current implementation is a no-op, but will be extended in small increments in

[PATCH 02/11] multi-pack-index: verify bad header

2018-09-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When verifying if a multi-pack-index file is valid, we want the command to fail to signal an invalid file. Previously, we wrote an error to stderr and continued as if we had no multi-pack-index. Now, die() instead of error(). Add tests that check corrupted headers in a few

[PATCH 00/11] Add 'git multi-pack-index verify' command

2018-09-05 Thread Derrick Stolee via GitGitGadget
The multi-pack-index file provides faster lookups in repos with many packfiles by duplicating the information from multiple pack-indexes into a single file. This series allows us to verify a multi-pack-index using 'git multi-pack-index verify' and 'git fsck' (when core.multiPackIndex is true).

jc/rebase-in-c-9-fixes, was Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Johannes Schindelin
Hi Junio, On Tue, 4 Sep 2018, Junio C Hamano wrote: > * jc/rebase-in-c-9-fixes (2018-09-04) 1 commit > - rebase: re-add forgotten -k that stands for --keep-empty > (this branch uses ag/rebase-i-in-c, > js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, > pk/rebase-in-c-2-basic,

Re: Git in Outreachy Dec-Mar?

2018-09-05 Thread Ævar Arnfjörð Bjarmason
On Thu, Aug 30 2018, Jeff King wrote: > On Thu, Aug 30, 2018 at 02:18:19PM +0200, Ævar Arnfjörð Bjarmason wrote: >> > - it naturally limits the candidate pool to under-represented groups >> > (which is the whole point of the program, but if you don't >> > actually care about that,

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-05 Thread Luke Diamand
On 5 September 2018 at 13:39, Johannes Schindelin wrote: > Hi Luke, > > On Wed, 5 Sep 2018, Luke Diamand wrote: > >> On 4 September 2018 at 12:09, Johannes Schindelin >> wrote: >> > >> > On Tue, 4 Sep 2018, Eric Sunshine wrote: >> > >> >> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-05 Thread Johannes Schindelin
Hi Luke, On Wed, 5 Sep 2018, Luke Diamand wrote: > On 4 September 2018 at 12:09, Johannes Schindelin > wrote: > > > > On Tue, 4 Sep 2018, Eric Sunshine wrote: > > > >> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget > >> wrote: > >> > So let's do something different in

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 05 2018, Derrick Stolee wrote: > On 9/4/2018 6:07 PM, Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >> >>> With --stdin-packs we don't show any estimation of how much is left to >>> do. This is because we might be processing more than one pack. We >>> could be less lazy

Re: [PATCH 0/2] commit-graph: add progress output

2018-09-05 Thread Derrick Stolee
On 9/4/2018 4:27 PM, Ævar Arnfjörð Bjarmason wrote: This series adds progress output to the commit-graph command, so that when it's called by "git gc" or "git fsck" we can see what's going on with it. Ævar Arnfjörð Bjarmason (2): commit-graph write: add progress output commit-graph

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-05 Thread Derrick Stolee
On 9/4/2018 4:27 PM, Ævar Arnfjörð Bjarmason wrote: @@ -591,8 +597,13 @@ static void close_reachable(struct packed_oid_list *oids) { int i; struct commit *commit; + struct progress *progress = NULL; + int j = 0; The change below over-counts the number of commits

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-05 Thread Derrick Stolee
On 9/4/2018 6:07 PM, Junio C Hamano wrote: Ævar Arnfjörð Bjarmason writes: With --stdin-packs we don't show any estimation of how much is left to do. This is because we might be processing more than one pack. We could be less lazy here and show progress, either detect by detecting that we're

  1   2   >