Re: [PATCH 1/1] t6500(mingw): use the Windows PID of the shell

2019-05-07 Thread Junio C Hamano
Junio C Hamano writes: > Eric Sunshine writes: > >> On Tue, May 7, 2019 at 5:51 PM Johannes Schindelin via GitGitGadget >> wrote: >>> [...] >>> Let's fix this by making sure that the Windows PID is written into >>> `gc.pid` in this test script soo that `git.exe` is able to understand I amended

Re: [PATCH v2] t4253-am-keep-cr-dos: avoid using pipes

2019-05-07 Thread Junio C Hamano
"LI, BO XUAN" writes: > Thanks for your review! I can understand your point, but I've got a > quick question: > > What if format-patch really breaks and 'am' magically does not break? Doesn't that indicate that you are not testing the result of "am" adequately? I am not saying it is *wrong* to

Re: [PATCH] make slash-rules more readable

2019-05-07 Thread Junio C Hamano
"Dr. Adam Nielsen" writes: > + - A pattern that contains a non-trailing slash is matched > + For example, `doc/frotz/` matches `doc/frotz` directory, but not > + `a/doc/frotz` (relative from the `.gitignore` file). > + Note that the pattern `doc/frotz` and `/doc/frotz` have the > + same e

Re: [RFC WIP PATCH v8 00/13] learn --keep-base & more

2019-05-07 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This is a WIP series I have that I figured I'd send out as-is for > comment since Junio said he'd be merging dl/rebase-i-keep-base down. > > So I wanted to test it, and as seen early in this series in 3/13 and > 4/13 we had significant blindspots in our tests, i

Re: [PATCH 1/1] t6500(mingw): use the Windows PID of the shell

2019-05-07 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, May 7, 2019 at 5:51 PM Johannes Schindelin via GitGitGadget > wrote: >> [...] >> Let's fix this by making sure that the Windows PID is written into >> `gc.pid` in this test script soo that `git.exe` is able to understand >> that that process does indeed still exis

Re: [PATCH v5 1/2] documentation: add tutorial for first contribution

2019-05-07 Thread Junio C Hamano
Emily Shaffer writes: > +=== Clone the Git Repository > + > +Git is mirrored in a number of locations. Clone the repository from one of > them; > +https://git-scm.com/downloads suggests one of the best places to clone from > is > +the official mirror on GitHub. I didn't want to have to get int

Re: [PATCH v5 0/2] documentation: add lab for first contribution

2019-05-07 Thread Junio C Hamano
Emily Shaffer writes: > - Removed 'extern' from the addition to builtin.h I said something that conflicts with this in my message to JTan, but I am fine with this removal of extern, as it is reasonable that Denton Liu's no-extern work would land soonish. I agree with the spirit of all the other

Re: [PATCH v3 0/2] Fix fsmonitor after discard_index()

2019-05-07 Thread Junio C Hamano
Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> This v3 is all Johannes's patches. The outstanding review on v2 could >> be clarified with a commit message change, which I've addressed, and >> v2 conflicted with a cache.h change that's since landed in "master", >> which I've rebas

Re: [PATCH 2/2] format-patch: Make --base patch-id output stable

2019-05-07 Thread Junio C Hamano
Stephen Boyd writes: > Quoting Junio C Hamano (2019-05-06 21:38:24) >> Stephen Boyd writes: >> >> > I wonder if we need to make some other sort of form of >> > "prerequisite-patch-id:" here and let that be a legacy form of the >> > patch-id so that users know that they have a fixed version of t

Re: [PATCH v4] documentation: add tutorial for first contribution

2019-05-07 Thread Junio C Hamano
Jonathan Tan writes: > Sorry for not looking at this sooner. > > Firstly, I'm not sure if this file should be named without the ".txt", > like SubmittingPatches. SubmittingPatches has historical baggage but this does not, so its source can be left as .txt (alternatively we could have added .txt

Re: [PATCH v3 0/6] perf-lib.sh: fix 0baf78e7bc regression, refactor & fix bugs

2019-05-07 Thread Junio C Hamano
Jeff King writes: > I think this is reasonable, especially with the feature in patch 6 to > tell the caller they're doing it wrong, instead of just silently > producing nonsense results. > > Junio, if you haven't been following closely, this can replace my patch > from jk/perf-installed-fix. I d

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This may just be more insanity to implement right now, but perhaps in > addition to "gitdir:" etc. in the IncludeIf config syntax we'd want to > aim for "HEADref" (or some saner name). I.e. allowing to include/enable > arbitrary config based on the ref name. > >

Re: [PATCH] make slash rules more readable

2019-05-07 Thread Junio C Hamano
"Dr. Adam Nielsen" writes: > On 07.05.19 12:07, Junio C Hamano wrote: >> "Dr. Adam Nielsen" writes: >> >>> gitignore.txt: make slash-rules more readable >>> >>> Make all paragraphs valid, even if they are not read >>> in strict order. Make paragraph better understandable >>> for pattern without

[RFC WIP PATCH v8 10/13] rebase: don't rebase linear topology with --fork-point

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Fix a regression introduced in 4f21454b55 ("merge-base: handle --fork-point without reflog", 2016-10-12). Before that change having a linear history on top of an upstream master would with --fork-point (aka argument-less rebase) tell us there was nothing to be done: $ git rebase Current b

[RFC WIP PATCH v8 05/13] rebase: refactor can_fast_forward into goto tower

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu Before, can_fast_forward was written with an if-else statement. However, in the future, we may be adding more termination cases which would lead to deeply nested if statements. Refactor to use a goto tower so that future cases can be easily inserted. Signed-off-by: Denton Liu

[RFC WIP PATCH v8 09/13] rebase tests: test linear branch topology

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Add tests rebasing a linear branch topology to linear rebase tests added in 2aad7cace2 ("add simple tests of consistency across rebase types", 2013-06-06). These tests are duplicates of two surrounding tests that do the same with tags pointing to the same objects. Right now there's no change in be

[RFC WIP PATCH v8 06/13] rebase: fast-forward --onto in more cases

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu Before, when we had the following graph, A---B---C (master) \ D (side) running 'git rebase --onto master... master side' would result in D being always rebased, no matter what. However, the desired behavior is that rebase should notice that th

[RFC WIP PATCH v8 08/13] rebase: teach rebase --keep-base

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquash, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This is useful when contribu

[RFC WIP PATCH v8 07/13] rebase: fast-forward --fork-point in more cases

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu Before, when we rebased with a --fork-point invocation where the fork-point wasn't empty, we would be setting options.restrict_revision. The fast-forward logic would automatically declare that the rebase was not fast-forwardable if it was set. However, this was painting with a ve

[RFC WIP PATCH v8 11/13] rebase: eliminate side-effects from can_fast_forward()

2019-05-07 Thread Ævar Arnfjörð Bjarmason
The can_fast_forward() function is potentially much more expensive than is_interactive() since it e.g. might need to call is_linear_history(). So reversing the two looks like an obvious improvement, but doing so reveals a previously hidden caveat: We need the can_fast_forward() function to populat

[RFC WIP PATCH v8 13/13] WIP: can_fast_forward() support for --preserve-merges and --rebase-merges

2019-05-07 Thread Ævar Arnfjörð Bjarmason
This seems to work, needs more tests etc... Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/rebase.c | 6 ++ t/t3432-rebase-fast-forward.sh | 7 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 167d4fcf67..de1c

[RFC WIP PATCH v8 02/13] t3432: test rebase fast-forward behavior

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu When rebase is run on a branch that can be fast-forwarded, this should automatically be done. Create test to ensure this behavior happens. There are some cases that currently don't pass. The first case is where a feature and master have diverged, running "git rebase master... ma

[RFC WIP PATCH v8 12/13] rebase: add a should_fast_forward() utility function

2019-05-07 Thread Ævar Arnfjörð Bjarmason
The is_interactive() test gets tricky around --rebase-merges. Let's split our use of it for the purposes of whether we should try fast-forwarding a rebase into a utility function to prepare for adding more logic to that specific codepath. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/rebase

[RFC WIP PATCH v8 03/13] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Change "same head" introduced in the preceding commit to check whether the rebase.c code lands in the can_fast_forward() case in, and thus prints out an "is up to date" and aborts early. In some of these cases we make it past that and to "rewinding head", then do a rebase, only to find out there's

[RFC WIP PATCH v8 04/13] t3432: test for --no-ff's interaction with fast-forward

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Add more stress tests for the can_fast_forward() case in rebase.c. These tests are getting rather verbose, but now we can see under --ff and --no-ff whether we skip work, or whether we're forced to run the rebase. These tests aren't supposed to endorse the status quo, just test for what we're curr

[RFC WIP PATCH v8 00/13] learn --keep-base & more

2019-05-07 Thread Ævar Arnfjörð Bjarmason
This is a WIP series I have that I figured I'd send out as-is for comment since Junio said he'd be merging dl/rebase-i-keep-base down. So I wanted to test it, and as seen early in this series in 3/13 and 4/13 we had significant blindspots in our tests, i.e. there were no tests for whether --no-ff

[RFC WIP PATCH v8 01/13] t3431: add rebase --fork-point tests

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Denton Liu Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- t/t3431-rebase-fork-point.sh | 53 1 file changed, 53 insertions(+) create mode 100755 t/t3431-rebase-fork-point.sh diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-for

Re: [PATCH v5 1/2] documentation: add tutorial for first contribution

2019-05-07 Thread Emily Shaffer
> +Add a line to `#include "config.h"`. Then, add the following bits to the > +function body: > + > + > + const char *cfg_name; > + > +... > + > + git_config(git_default_config, NULL) > + if (git_config_get_string_const("user.name", &cfg_name) > 0) { > + printf(_("No nam

[PATCH v2] Make fread/fwrite-like functions in http.c more like fread/fwrite.

2019-05-07 Thread Mike Hommey
The fread/fwrite-like functions in http.c, namely fread_buffer, fwrite_buffer, fwrite_null, fwrite_sha1_file all return the multiplication of the size and number of items they are being given. Practically speaking, it doesn't matter, because in all contexts where those functions are used, size is

Re: [PATCH] t/lib-httpd: pass LSAN_OPTIONS through apache

2019-05-07 Thread Josh Steadmon
On 2019.05.07 18:30, Jeff King wrote: > Just as we instruct Apache to pass through ASAN_OPTIONS (so that > server-side Git programs it spawns will respect our options while > running the tests), we should do the same with LSAN_OPTIONS. Otherwise > trying to collect a list of leaks like: > > ex

[PATCH] t/lib-httpd: pass LSAN_OPTIONS through apache

2019-05-07 Thread Jeff King
Just as we instruct Apache to pass through ASAN_OPTIONS (so that server-side Git programs it spawns will respect our options while running the tests), we should do the same with LSAN_OPTIONS. Otherwise trying to collect a list of leaks like: export LSAN_OPTIONS=exitcode=0:log_path=/tmp/lsan

Re: [PATCH] commit-graph: fix memory leak

2019-05-07 Thread Jeff King
On Tue, May 07, 2019 at 11:49:41AM +0200, Ævar Arnfjörð Bjarmason wrote: > I wonder in general if there's a more sustainable solution to these > one-at-a-time memory leak fixes we're doing to these > libraries. E.g. marking some tests in the test suite as passing cleanly > with valgrind's leak che

Re: [PATCH 1/1] t6500(mingw): use the Windows PID of the shell

2019-05-07 Thread Eric Sunshine
On Tue, May 7, 2019 at 5:51 PM Johannes Schindelin via GitGitGadget wrote: > [...] > Let's fix this by making sure that the Windows PID is written into > `gc.pid` in this test script soo that `git.exe` is able to understand > that that process does indeed still exist. > > Signed-off-by: Johannes S

Re: Proposal: object negotiation for partial clones

2019-05-07 Thread Matthew DeVore
> On 2019/05/07, at 11:34, Jonathan Tan wrote: > > To get an enumeration of available objects, don't you need to use only > "blob:none"? Combining filters (once that's implemented) will get all > objects only up to a certain depth. > > Combining "tree:" and "blob:none" would allow us to reduc

[PATCH 0/1] Proactively fix a test issue with v3.x of the MSYS2 runtime

2019-05-07 Thread Johannes Schindelin via GitGitGadget
I saw this in one of my builds that followed the bleeding edge of Git for Windows' SDK: git.exe has a different idea of the test script's PID than the test script itself. Yet another of the quirks Git for Windows has to deal with... Johannes Schindelin (1): t6500(mingw): use the Windows PID of t

[PATCH 1/1] t6500(mingw): use the Windows PID of the shell

2019-05-07 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In Git for Windows, we use the MSYS2 Bash which inherits a non-standard PID model from Cygwin's POSIX emulation layer: every MSYS2 process has a regular Windows PID, and in addition it has an MSYS2 PID (which corresponds to a shadow process that emulates Unix-style signa

Re: [PATCH] Make fread/fwrite-like functions in http.c more like fread/fwrite.

2019-05-07 Thread Jeff King
On Tue, May 07, 2019 at 04:58:32PM +0200, SZEDER Gábor wrote: > On Wed, May 01, 2019 at 05:56:35PM +0900, Mike Hommey wrote: > > The fread/fwrite-like functions in http.c, namely fread_buffer, > > fwrite_buffer, fwrite_null, fwrite_sha1_file all return the > > multiplication of the size and number

[PATCH v5 0/2] documentation: add lab for first contribution

2019-05-07 Thread Emily Shaffer
Since v4, I've made one major change and a handful of minor changes. The major change is contained entirely in patch 2/2; patch 1/2 has only nit fixes compared to v4. Major: - I've added anchors to each section. These anchors are custom-named in order to be compatible with asciidoc as well as as

[PATCH v5 1/2] documentation: add tutorial for first contribution

2019-05-07 Thread Emily Shaffer
This tutorial covers how to add a new command to Git and, in the process, everything from cloning git/git to getting reviewed on the mailing list. It's meant for new contributors to go through interactively, learning the techniques generally used by the git/git development community. Reviewed-by:

[PATCH v5 2/2] documentation: add anchors to MyFirstContribution

2019-05-07 Thread Emily Shaffer
During the course of review for MyFirstContribution.txt, the suggestion came up to include anchors to make it easier for veteran contributors to link specific sections of this documents to newbies. To make life easier for reviewers, add these anchors in their own commit. See review context here: ht

Re: [PATCH v3 0/6] perf-lib.sh: fix 0baf78e7bc regression, refactor & fix bugs

2019-05-07 Thread Jeff King
On Tue, May 07, 2019 at 12:54:28PM +0200, Ævar Arnfjörð Bjarmason wrote: > So here as a 6-parter given some of the feedback on v2. Maybe Jeff > still hates it :), but this time around some of the changes are split > up and should be easier to understand in isolation, as well as some > more "notice

Re: [PATCH v2 2/2] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh

2019-05-07 Thread Jeff King
On Tue, May 07, 2019 at 10:31:23AM +0200, Ævar Arnfjörð Bjarmason wrote: > > I'm not sure I get what's going on here. Why do we need the realpath in > > aggregate.perl? We'd want to generate the same filename that "run" > > decided to store things in, which we'd generate from the command-line > >

Re: [PATCH v4] documentation: add tutorial for first contribution

2019-05-07 Thread Jonathan Tan
> On Mon, May 06, 2019 at 03:28:44PM -0700, Jonathan Tan wrote: > > Sorry for not looking at this sooner. > > > > Firstly, I'm not sure if this file should be named without the ".txt", > > like SubmittingPatches. > > I should mention that during this change's life as a GitGitGadget PR, > dscho p

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread Phillip Wood
On 07/05/2019 17:07, Junio C Hamano wrote: SZEDER Gábor writes: This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be compiled on its own, because it starts using 'struct replay_opts' here, which is defined in 'sequencer.h', but 'builtin/rebase.c' doesn't include that header yet.

Re: [PATCH v4] documentation: add tutorial for first contribution

2019-05-07 Thread Emily Shaffer
On Mon, May 06, 2019 at 03:28:44PM -0700, Jonathan Tan wrote: > Sorry for not looking at this sooner. > > Firstly, I'm not sure if this file should be named without the ".txt", > like SubmittingPatches. I should mention that during this change's life as a GitGitGadget PR, dscho performed a revie

Re: [PATCH v4] documentation: add tutorial for first contribution

2019-05-07 Thread Emily Shaffer
On Thu, May 02, 2019 at 07:11:04PM -0700, Phil Hord wrote: > On Tue, Apr 23, 2019 at 12:35 PM Emily Shaffer > wrote: > > > > This tutorial covers how to add a new command to Git and, in the > > process, everything from cloning git/git to getting reviewed on the > > mailing list. It's meant for ne

Re: Proposal: object negotiation for partial clones

2019-05-07 Thread Jonathan Tan
> > My main question is: we can get the same list of objects (in the form of > > tree objects) if we fetch with "blob:none" filter. Admittedly, we will > > get extra data (file names, etc.) - if the extra bandwidth saving is > > necessary, this should be called out. (And some of the savings will be

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-07 Thread Emily Shaffer
On Tue, May 07, 2019 at 05:36:56PM +0700, Duy Nguyen wrote: > On Tue, May 7, 2019 at 9:21 AM Emily Shaffer wrote: > > I've got a usability comment, as we're giving restore a try within > > Google for now. > > Thanks. I thought I was the only guinea pig :D and obviously not a > good one since I kn

Re: [PATCH 2/2] format-patch: Make --base patch-id output stable

2019-05-07 Thread Stephen Boyd
Quoting Junio C Hamano (2019-05-06 21:38:24) > Stephen Boyd writes: > > > I wonder if we need to make some other sort of form of > > "prerequisite-patch-id:" here and let that be a legacy form of the > > patch-id so that users know that they have a fixed version of this code? > > Maybe "prerequis

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Elijah Newren
On Tue, May 7, 2019 at 7:12 AM Robert Dailey wrote: > On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason > wrote: > The majority use case I'm interested in is seeing net-positive changes > that happen in merge commits. Normally I take for granted that merge > commits have nothing meaningful

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread Junio C Hamano
SZEDER Gábor writes: > This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be > compiled on its own, because it starts using 'struct replay_opts' > here, which is defined in 'sequencer.h', but 'builtin/rebase.c' > doesn't include that header yet. (Though 'pu' already builds fine, >

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Ævar Arnfjörð Bjarmason
On Tue, May 07 2019, Denton Liu wrote: > On Wed, May 08, 2019 at 12:05:43AM +0900, Junio C Hamano wrote: >> Denton Liu writes: > > [snip] > >> > >> > Would you suggest moving to a format..* approach or would it >> > make sense to rename the configs to something like >> > branch..{emailCoverSubj

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Eckhard Maaß
On Tue, May 07, 2019 at 10:58:49AM -0400, Denton Liu wrote: > For more details, this code[2] just blindly diffs the first two > endpoints returned preceding `repo_init_revisions`. If you throw in more than two endpoints, the result is a combined diff with respect to the first commit. You can have

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Ævar Arnfjörð Bjarmason
On Tue, May 07 2019, Robert Dailey wrote: > On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason > wrote: >> Maybe an example helps, let's say you have two paint buckets, one with >> red paint, one with yellow paint. You mix them. What happens? >> >> ( >> rm -rf /tmp/git && >>

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Denton Liu
On Wed, May 08, 2019 at 12:05:43AM +0900, Junio C Hamano wrote: > Denton Liu writes: [snip] > > > > Would you suggest moving to a format..* approach or would it > > make sense to rename the configs to something like > > branch..{emailCoverSubject,emailTo,emailCc}? > > So if I have to pick betwe

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-05-07 Thread SZEDER Gábor
On Fri, Apr 26, 2019 at 11:32:12AM +0100, Phillip Wood wrote: > From: Phillip Wood > > When `rebase -r` finishes it removes any refs under refs/rewritten > that it has created. However if the rebase is aborted these refs are > not removed. This can cause problems for future rebases. For example I

Re: [PATCH v3 0/4] cleanup revisions.txt

2019-05-07 Thread Junio C Hamano
Denton Liu writes: > I noticed that there are both `dl/rev-tilde-doc-clarify` and > `dl/revisions-doc-update` branches. The latter comes from this patchset > and is a complete replacement for the former. Thanks for spotting. Will replace the former with the updated patches. Thanks.

Re: [PATCH] Make fread/fwrite-like functions in http.c more like fread/fwrite.

2019-05-07 Thread SZEDER Gábor
On Wed, May 01, 2019 at 05:56:35PM +0900, Mike Hommey wrote: > The fread/fwrite-like functions in http.c, namely fread_buffer, > fwrite_buffer, fwrite_null, fwrite_sha1_file all return the > multiplication of the size and number of items they are being given. > > Practically speaking, it doesn't m

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Denton Liu
Hi Robert, On Tue, May 07, 2019 at 09:10:12AM -0500, Robert Dailey wrote: [snip] > Even ignoring that issue, the more concerning observation of mine is > that `diff @^!` produces any output at all. If you exclude both > parents, why do I see a diff for parent 2 (I see the complete diff of > the

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Junio C Hamano
Denton Liu writes: > The reason why I chose to use branch..* is because format-patch > currently reads from branch..description and I wanted to build on > top of that. In addition, I didn't want to scatter branch-specific > configs in two different place (i.e. have a branch..description > alongsi

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Robert Dailey
On Tue, May 7, 2019 at 9:10 AM Robert Dailey wrote: > Your example is very helpful. I understand what you're saying for > conflicted lines. But the "whatever the default merge resolution would > have been" doesn't exist, because there's no reality where line 1 in > color.txt can be something "auto

Re: [PATCH v3 0/4] cleanup revisions.txt

2019-05-07 Thread Denton Liu
Hi Junio, I noticed that there are both `dl/rev-tilde-doc-clarify` and `dl/revisions-doc-update` branches. The latter comes from this patchset and is a complete replacement for the former. Thanks, Denton On Sun, May 05, 2019 at 12:06:54PM -0400, Denton Liu wrote: > Thanks again for the comments

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Denton Liu
Hi Junio, On Tue, May 07, 2019 at 05:56:00PM +0900, Junio C Hamano wrote: > Denton Liu writes: > > > Currently, format-patch only accepts branch..description as a > > branch-specific configuration variable. However, there are many other > > options which would be useful to have on a branch-by-bra

Re: Merge commit diff results are confusing and inconsistent

2019-05-07 Thread Robert Dailey
On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason wrote: > Maybe an example helps, let's say you have two paint buckets, one with > red paint, one with yellow paint. You mix them. What happens? > > ( > rm -rf /tmp/git && > git init /tmp/git && > cd /tmp/git && >

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-07 Thread Phillip Wood
Hi Junio On 05/05/2019 05:02, Junio C Hamano wrote: Phillip Wood writes: I've had a look at the rebase -i code and I think it only overwrites ignored files when it is fast-forwarding. This matches what merge does when fast-forwarding but I'm not convinced either of them should be doing this b

Re: [PATCH 1/1] cvsexportcommit: force crlf translation

2019-05-07 Thread Junio C Hamano
Dustin Spicuzza writes: > Yes, your interpretation is exactly correct, even the interpretation of > the uncertainty of the message. > > I didn't send the patch to this list though, not sure why gitgitgadget > decided to do so (I've never heard of it before now). The patch was > originally submitt

Re: [PATCH v3 0/2] Fix fsmonitor after discard_index()

2019-05-07 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > This v3 is all Johannes's patches. The outstanding review on v2 could > be clarified with a commit message change, which I've addressed, and > v2 conflicted with a cache.h change that's since landed in "master", > which I've rebased this on. > > Junio: We're get

Re: [PATCH 1/1] cvsexportcommit: force crlf translation

2019-05-07 Thread Dustin Spicuzza
Yes, your interpretation is exactly correct, even the interpretation of the uncertainty of the message. I didn't send the patch to this list though, not sure why gitgitgadget decided to do so (I've never heard of it before now). The patch was originally submitted to git for windows (PR #938), with

Re: [PATCH v2] t4253-am-keep-cr-dos: avoid using pipes

2019-05-07 Thread LI, BO XUAN
Hi Junio, Thanks for your review! I can understand your point, but I've got a quick question: What if format-patch really breaks and 'am' magically does not break? Then the two tests might still pass. On the contrary, with this patch, we can verify the correctness of format-patch and safely rely

Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 10:43 AM Junio C Hamano wrote: > -- >8 -- > Subject: t0040: protect lines that are indented by spaces > > This block is byte-for-byte identical expected output, that contains a > few lines that are indented in many spaces, which makes "git diff --check" > unhappy and will br

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-07 Thread SZEDER Gábor
On Mon, May 06, 2019 at 07:43:34PM -0400, Jeff King wrote: > Subject: [PATCH] coccicheck: optionally batch spatch invocations > > In our "make coccicheck" rule, we currently feed each source file to its > own individual invocation of spatch. This has a few downsides: > > - it repeats any overhe

[PATCH v3 1/2] fsmonitor: demonstrate that it is not refreshed after discard_index()

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Johannes Schindelin This one is tricky. When `core.fsmonitor` is set, a `refresh_index()` will not perform a full scan of files that might be modified, but will query the fsmonitor and refresh only the ones that have been actually touched. Due to implementation details, the fsmonitor is q

[PATCH v3 0/2] Fix fsmonitor after discard_index()

2019-05-07 Thread Ævar Arnfjörð Bjarmason
This v3 is all Johannes's patches. The outstanding review on v2 could be clarified with a commit message change, which I've addressed, and v2 conflicted with a cache.h change that's since landed in "master", which I've rebased this on. Junio: We're getting closer to the release so it would be grea

[PATCH v3 2/2] fsmonitor: force a refresh after the index was discarded

2019-05-07 Thread Ævar Arnfjörð Bjarmason
From: Johannes Schindelin With this change, the `index_state` struct becomes the new home for the flag that says whether the fsmonitor hook has been run, i.e. it is now per-index. It also gets re-set when the index is discarded, fixing the bug demonstrated by the "test_expect_failure" test added

Re: [PATCH 0/2] read-tree: improve untracked file support

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 5:02 PM Phillip Wood wrote: > > My (biased, obviously) view is that "git reset --hard" is very > > dangerous and I'm not trying to change that, especially when its > > behavior has been like this since forever and I'm sure it's used in > > scripts. > > > > Instead "git resto

[PATCH v3 2/6] perf aggregate: remove GIT_TEST_INSTALLED from --codespeed

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Remove the setting of the "environment" from the --codespeed output. I don't think this is useful, and it helps with a later refactoring where we GIT_TEST_INSTALLED stop munging/reading GIT_TEST_INSTALLED in the perf tests in so many places. This was added in 05eb1c37ed ("perf/aggregate: implement

[PATCH v3 6/6] perf-lib.sh: forbid the use of GIT_TEST_INSTALLED

2019-05-07 Thread Ævar Arnfjörð Bjarmason
As noted in preceding commits setting GIT_TEST_INSTALLED has never been supported or documented, and as noted in an earlier t/perf/README change to the extent that it's been documented nobody's notices that the example hasn't worked since 3c8f12c96c ("test-lib: reorder and include GIT-BUILD-OPTIONS

[PATCH v3 0/6] perf-lib.sh: fix 0baf78e7bc regression, refactor & fix bugs

2019-05-07 Thread Ævar Arnfjörð Bjarmason
So here as a 6-parter given some of the feedback on v2. Maybe Jeff still hates it :), but this time around some of the changes are split up and should be easier to understand in isolation, as well as some more "noticed while I was at it" things fixed. This series ends with outright forbidding the

[PATCH v3 4/6] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Follow-up my preceding change which fixed the immediate "./run " regression in 0baf78e7bc ("perf-lib.sh: rely on test-lib.sh for --tee handling", 2019-03-15) and entirely get rid of GIT_TEST_INSTALLED from perf-lib.sh (and aggregate.perl). As noted in that change the dance we're doing with GIT_TES

[PATCH v3 5/6] perf tests: add "bindir" prefix to git tree test results

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Change the output file names in test-results/ to be "test-results/bindir_" rather than just "test-results/". This is for consistency with the "build_" directories we have for built revisions, i.e. "test-results/build_". There's no user-visible functional changes here, it just makes it easier to s

[PATCH v3 1/6] perf README: correct docs for 3c8f12c96c regression

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Since 3c8f12c96c ("test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier", 2012-06-24) the suggested advice of overriding GIT_BUILD_DIR has not worked. We've printed a hard error like this given e.g. GIT_BUILD_DIR=/home/avar/g/git: /bin-wrappers/git is not executable; using GIT_EXEC_PA

[PATCH v3 3/6] perf-lib.sh: make "./run " use the correct gits

2019-05-07 Thread Ævar Arnfjörð Bjarmason
Fix a really bad regression in 0baf78e7bc ("perf-lib.sh: rely on test-lib.sh for --tee handling", 2019-03-15). Since that change all runs of different of git have used the git found in the user's $PATH, e.g. /usr/bin/git instead of the we just built and wanted to performance test. The problem st

Re: Request to add option to interactive rebase to preserve latest commit date

2019-05-07 Thread Jeff Schwartz
Yes, exactly. When squashing or fixup-ing commits via rebase I really want "git log" to show the date and time of the rebase operation and not the date and time of the commit I rebased onto, which could be months or even years in the past. I once worked on a project where part of the code-base hadn

Dear friend.

2019-05-07 Thread Ututuuotu Wadi
I assume you and your family are in good health. I am the Foreign operations Manager at one of the leading generation bank here in West Africa. In my bank; there resides an overdue and unclaimed sum of $15.5m, when the account holder suddenly passed on, he left no beneficiary who would be entitled

[PATCH] make slash-rules more readable

2019-05-07 Thread Dr. Adam Nielsen
gitignore.txt: make slash-rules more readable Make all paragraphs valid, even if they are not read in strict order. Make paragraph better understandable for pattern without slash. Add paragraph for pattern with slash. Be precise whenever a trailing slashes would make a difference. Add some example

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 9:21 AM Emily Shaffer wrote: > I've got a usability comment, as we're giving restore a try within > Google for now. Thanks. I thought I was the only guinea pig :D and obviously not a good one since I know too much (which is not a good thing as a tester). > I found myself i

Re: [PATCH] make slash rules more readable

2019-05-07 Thread Dr. Adam Nielsen
On 07.05.19 12:07, Junio C Hamano wrote: "Dr. Adam Nielsen" writes: gitignore.txt: make slash-rules more readable Make all paragraphs valid, even if they are not read in strict order. Make paragraph better understandable for pattern without slash. Add paragraph for pattern with slash. Be p

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 6:43 AM Jeff King wrote: > > On Mon, May 06, 2019 at 04:34:09PM +0700, Duy Nguyen wrote: > > > > However, it comes at a cost. The RSS of each spatch process goes from > > > ~50MB to ~1500MB (and peak memory usage may be even higher if make runs > > > > 1.5G should be fine. T

Re: [PATCH] make slash rules more readable

2019-05-07 Thread Junio C Hamano
"Dr. Adam Nielsen" writes: > gitignore.txt: make slash-rules more readable > > Make all paragraphs valid, even if they are not read > in strict order. Make paragraph better understandable > for pattern without slash. Add paragraph for pattern > with slash. Be precise whenever a trailing slashes

Re: [PATCH 0/2] read-tree: improve untracked file support

2019-05-07 Thread Phillip Wood
On 02/05/2019 11:53, Duy Nguyen wrote: On Wed, May 1, 2019 at 9:58 PM Phillip Wood wrote: On 01/05/2019 11:31, Duy Nguyen wrote: On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote: From: Phillip Wood These two patches teach read-tree how to avoid overwriting untracked files when doing '--r

[PATCH] submodule--helper: add a missing \n

2019-05-07 Thread Nguyễn Thái Ngọc Duy
This is a complete line. We're not expecting the next function to add anything to the same line. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index

Re: [PATCH] commit-graph: fix memory leak

2019-05-07 Thread Ævar Arnfjörð Bjarmason
On Mon, May 06 2019, Josh Steadmon wrote: > Free the commit graph when verify_commit_graph_lite() reports an error. > Credit to OSS-Fuzz for finding this leak. > > Signed-off-by: Josh Steadmon > --- > commit-graph.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/co

Re: [PATCH 1/1] t5580: verify that alternates can be UNC paths

2019-05-07 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > gentle ping: this patch was not picked up yet, although it should be > pretty uncontroversial. Thanks. It does look it fell through the cracks without sound. Will pick it up.

Re: [PATCH 1/1] cvsexportcommit: force crlf translation

2019-05-07 Thread Junio C Hamano
"Dustin Spicuzza via GitGitGadget" writes: > From: Dustin Spicuzza > > When using cvsnt + msys + git, it seems like the output of cvs status > had \r\n in it, and caused the command to fail. This is a bit under-explained in that it does not make it clear where the right place to fix would be.

Re: [PATCH v2] t4253-am-keep-cr-dos: avoid using pipes

2019-05-07 Thread Junio C Hamano
Boxuan Li writes: > The exit code of the upstream in a pipe is ignored thus we should avoid > using it. By writing out the output of the git command to a file, we can > test the exit codes of both the commands. We are trying to catch breakages in "am" in these two tests (see the title of the tes

Re: [PATCH 0/7] teach branch-specific options for format-patch

2019-05-07 Thread Junio C Hamano
Denton Liu writes: > Currently, format-patch only accepts branch..description as a > branch-specific configuration variable. However, there are many other > options which would be useful to have on a branch-by-branch basis, > namely cover letter subject and To: and Cc: headers. > > Teach format-p

Re: [PATCH v2 2/2] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh

2019-05-07 Thread Ævar Arnfjörð Bjarmason
On Tue, May 07 2019, Jeff King wrote: > On Tue, May 07, 2019 at 01:23:09AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> @@ -79,7 +95,16 @@ run_dirs_helper () { >> if test $# -gt 0 -a "$1" = --; then >> shift >> fi >> -if [ ! -d "$mydir" ]; then >> + >> +PERF_RESULTS_

Re: [PATCH 1/2] midx: pass a repository pointer

2019-05-07 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > From: Derrick Stolee > > Much of the multi-pack-index code focuses on the multi_pack_index > struct, and so we only pass a pointer to the current one. However, > we will insert a dependency on the packed_git linked list in a > future change, so we will

Re: [PATCH v3] repack: enable bitmaps by default on bare repos

2019-05-07 Thread Ævar Arnfjörð Bjarmason
On Tue, May 07 2019, Jeff King wrote: > On Sat, May 04, 2019 at 08:52:01AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > Note that Ævar's case was somebody running bitmaps locally and trying to >> > push, which I think is generally not a good match for bitmaps (even when >> > they work, they cost

Re: [PATCH 0/4] gc docs: modernize and fix the documentation

2019-05-07 Thread Jeff King
On Mon, May 06, 2019 at 11:44:06AM +0200, Ævar Arnfjörð Bjarmason wrote: > Maybe there's some case I haven't thought of that makes this stupid, but > I wonder if something like a "gc quarantine" might be a fix fo both of > the the issues you noted above. > > I.e. it seems to me that the main issu

  1   2   >