Re: [PATCH 2/2] setup: don't fail if commondir is deleted.

2019-02-16 Thread Eric Sunshine
On Fri, Feb 15, 2019 at 1:16 PM Michal Suchanek wrote: > When adding wotktrees git can die in get_common_dir_noenv while > examining existing worktrees because the commondir file does not exist. > Handle ENOENT so adding a worktree does not fail because of incompletely > set-up other worktree. > >

Re: [PATCH 1/2] worktree: fix worktree add race.

2019-02-16 Thread Eric Sunshine
On Fri, Feb 15, 2019 at 1:59 PM Junio C Hamano wrote: > Michal Suchanek writes: > > Git runs a stat loop to find a worktree name that's available and then does > > mkdir on the found name. Turn it to mkdir loop to avoid another invocation > > of > > worktree add finding the same free name and cr

Re: [Bug report] git diff stat shows unrelated diff

2019-02-16 Thread Junio C Hamano
Philip Oakley writes: >> Those who do *not* opt into that "early warning" configuration dance >> would eventually be warned whenever they type "diff A..B", and the >> timing for that eventuality is not under their control, so quite >> honestly, I do not see much point in "giving users the chance"

Re: [PATCH 1/1] Introduce "precious" file concept

2019-02-16 Thread Ævar Arnfjörð Bjarmason
On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote: [Re-CC some people involved the last time around] > A new attribute "precious" is added to indicate that certain files > have valuable content and should not be easily discarded even if they > are ignored or untracked. > > So far there are one pa

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

2019-02-16 Thread Junio C Hamano
"Randall S. Becker" writes: >> > The current condition of the code is (the generate_zero_bytes delete >> > was previously removed so can be ignored for the patch): >> >> Just to make sure I do not misunderstand, this result is with Max's patch but >> without the generate_zero_bytes stuff? > > Co

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

2019-02-16 Thread Randall S. Becker
On February 16, 2019 13:06, Junio C Hamano wrote: > "Randall S. Becker" writes: > > On February 16, 2019 3:27, Max Kirillov wrote: > >> What you could try is > >> https://public-inbox.org/git/20181124093719.10705-1- > m...@max630.net/ > >> (I'm not sure it would not conflict by now), this would re

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

2019-02-16 Thread Junio C Hamano
"Randall S. Becker" writes: > On February 16, 2019 3:27, Max Kirillov wrote: > >> What you could try is >> https://public-inbox.org/git/20181124093719.10705-1-...@max630.net/ >> (I'm not sure it would not conflict by now), this would remove dependency >> between tests. If it helps it would be ver

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

2019-02-16 Thread Randall S. Becker
On February 16, 2019 11:51, I wrote: > To: 'Max Kirillov' > Cc: 'SZEDER Gábor' ; 'Johannes Schindelin' > ; 'Junio C Hamano' ; > git@vger.kernel.org > Subject: RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News > > On February 16, 2019 3:27, Max Kirillov wrote: > > On Fri, Feb 15, 2019 a

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

2019-02-16 Thread Randall S. Becker
On February 16, 2019 3:27, Max Kirillov wrote: > On Fri, Feb 15, 2019 at 04:13:15PM -0500, Randall S. Becker wrote: > > Sadly, the fix does not change the results. In fact, it makes the hang > > far more likely. Subtest 6,7,8 fails here, at close() > > Correct, I did not expect it to help, it was

Re: [GSoC][PATCH 2/2] clone: use dir-iterator to avoid explicit dir traversal

2019-02-16 Thread Thomas Gummerer
On 02/15, Matheus Tavares wrote: > Replace usage of opendir/readdir/closedir API to traverse directories > recursively, at copy_or_link_directory function, by the dir-iterator > API. > > Signed-off-by: Matheus Tavares > --- > builtin/clone.c | 39 +++ > 1 file

Re: [Bug report] git diff stat shows unrelated diff

2019-02-16 Thread Philip Oakley
On 15/02/2019 23:32, Junio C Hamano wrote: Philip Oakley writes: On 15/02/2019 20:12, Junio C Hamano wrote: Historically, it was a mistake to allow A..B to be used for two endpoints, which was made back when we haven't thought things through. That is why I stopped "warn to deprecate and then

[PATCH 1/1] Introduce "precious" file concept

2019-02-16 Thread Nguyễn Thái Ngọc Duy
A new attribute "precious" is added to indicate that certain files have valuable content and should not be easily discarded even if they are ignored or untracked. So far there are one part of Git that are made aware of precious files: "git clean" will leave precious files alone. Signed-off-by: Ng

[PATCH 0/1] Introduce "precious" file attribute

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Compared to the last round [1], the "precious" attribute is now only used by "git clean". "git merge" and "git checkout" will not abort when they are about to overwrite precious files. [1] https://public-inbox.org/git/20181126193804.30741-1-pclo...@gmail.com/ Nguyễn Thái Ngọc Duy (1): Introduce

[PATCH v3 16/21] diff-parseopt: convert -C|--find-copies

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 59 +- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/diff.c b/diff.c index e51f6b3005..35bac115cc 100644 --- a/diff.c +++ b/diff.c @@ -4617,8 +

[PATCH v3 18/21] diff-parseopt: convert --no-renames|--[no--rename-empty

2019-02-16 Thread Nguyễn Thái Ngọc Duy
For --rename-empty, see 90d43b0768 (teach diffcore-rename to optionally ignore empty content - 2012-03-22) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 3 +++ diff.c | 13 ++--- 2 fi

[PATCH v3 19/21] diff-parseopt: convert --relative

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/diff.c b/diff.c index d423a06b41..b9c267a199 100644 --- a/diff.c +++ b/diff.c @@ -4960,6 +4960,18 @@ static enum parse_opt_r

[PATCH v3 20/21] diff-parseopt: convert --[no-]minimal

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index b9c267a199..33492e754f 100644 --- a/diff.c +++ b/diff.c @@ -5105,6 +5105,11 @@ static void prep_parse_options(struct

[PATCH v3 17/21] diff-parseopt: convert --find-copies-harder

2019-02-16 Thread Nguyễn Thái Ngọc Duy
--no-find-copies-harder is also added on purpose (because I don't see why we should not have the --no- version for this) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 35b

[PATCH v3 21/21] diff-parseopt: convert --ignore-some-changes

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 27 --- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/diff.c b/diff.c index 33492e754f..a63ee4a44d 100644 --- a/diff.c +++ b/diff.c @@ -5109,6 +5109,21 @@ static void prep_par

[PATCH v3 14/21] diff-parseopt: convert -M|--find-renames

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 35 +++ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/diff.c b/diff.c index d2139082b7..2c904e0526 100644 --- a/diff.c +++ b/diff.c @@ -4909,6 +4909,22 @@ static int d

[PATCH v3 12/21] diff-parseopt: convert --output-*

2019-02-16 Thread Nguyễn Thái Ngọc Duy
This also validates that the user specifies a single character in --output-indicator-*, not a string. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 10 + diff.c | 71 +- 2 files

[PATCH v3 15/21] diff-parseopt: convert -D|--irreversible-delete

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 2c904e0526..e51f6b3005 100644 --- a/diff.c +++ b/diff.c @@ -5060,6 +5060,9 @@ static void prep_parse_options(struct diff_

[PATCH v3 10/21] diff-parseopt: convert --stat*

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 118 + 1 file changed, 52 insertions(+), 66 deletions(-) diff --git a/diff.c b/diff.c index 9c8f5336bc..1feb13deb3 100644 --- a/diff.c +++ b/diff.c @@ -104,11 +

[PATCH v3 11/21] diff-parseopt: convert --[no-]compact-summary

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/diff.c b/diff.c index 1feb13deb3..b24f6825a1 100644 --- a/diff.c +++ b/diff.c @@ -4841,6 +4841,21 @@ static int parse_objfin

[PATCH v3 13/21] diff-parseopt: convert -B|--break-rewrites

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 62 ++ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/diff.c b/diff.c index 8df396cb9a..d2139082b7 100644 --- a/diff.c +++ b/diff.c @@ -4841,6 +4841,30 @@ static int parse_obj

[PATCH v3 09/21] diff-parseopt: convert -s|--no-patch

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 99047fb5fe..9c8f5336bc 100644 --- a/diff.c +++ b/diff.c @@ -4906,6 +4906,9 @@ static void prep_parse_options(struct diff_o

[PATCH v3 06/21] diff-parseopt: convert --patch-with-stat

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 0276f25200..b9811aefef 100644 --- a/diff.c +++ b/diff.c @@ -4921,6 +4921,10 @@ static void prep_parse_options(struct dif

[PATCH v3 03/21] diff-parseopt: convert --dirstat and friends

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 7 ++ diff.c | 39 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentatio

[PATCH v3 07/21] diff-parseopt: convert --name-only

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index b9811aefef..7ea308814f 100644 --- a/diff.c +++ b/diff.c @@ -4949,6 +4949,9 @@ static void prep_parse_options(struct diff_o

[PATCH v3 05/21] diff-parseopt: convert --summary

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 5e16082091..0276f25200 100644 --- a/diff.c +++ b/diff.c @@ -4942,6 +4942,9 @@ static void prep_parse_options(struct diff_o

[PATCH v3 08/21] diff-parseopt: convert --name-status

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 7ea308814f..99047fb5fe 100644 --- a/diff.c +++ b/diff.c @@ -4952,6 +4952,9 @@ static void prep_parse_options(struct diff_o

[PATCH v3 04/21] diff-parseopt: convert --check

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 1cdbe8e688..5e16082091 100644 --- a/diff.c +++ b/diff.c @@ -4939,6 +4939,9 @@ static void prep_parse_options(struct diff_o

[PATCH v3 02/21] diff-parseopt: convert --numstat and --shortstat

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index 12e333c67f..419b6ac4ae 100644 --- a/diff.c +++ b/diff.c @@ -4905,6 +4905,12 @@ static void prep_parse_options(struct

[PATCH v3 00/21] nd/diff-parseopt part 2

2019-02-16 Thread Nguyễn Thái Ngọc Duy
v3 is the same as v2 except I will not delete the patches while it's still sending, grr... Nguyễn Thái Ngọc Duy (21): diff-parseopt: convert --patch-with-raw diff-parseopt: convert --numstat and --shortstat diff-parseopt: convert --dirstat and friends diff-parseopt: convert --check diff-

[PATCH v3 01/21] diff-parseopt: convert --patch-with-raw

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 4bc9df7362..12e333c67f 100644 --- a/diff.c +++ b/diff.c @@ -4901,6 +4901,10 @@ static void prep_parse_options(struct dif

[PATCH v2 05/21] diff-parseopt: convert --summary

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 5e16082091..0276f25200 100644 --- a/diff.c +++ b/diff.c @@ -4942,6 +4942,9 @@ static void prep_parse_options(struct diff_o

[PATCH v2 03/21] diff-parseopt: convert --dirstat and friends

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 7 ++ diff.c | 39 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentatio

[PATCH v2 04/21] diff-parseopt: convert --check

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 1cdbe8e688..5e16082091 100644 --- a/diff.c +++ b/diff.c @@ -4939,6 +4939,9 @@ static void prep_parse_options(struct diff_o

[PATCH v2 02/21] diff-parseopt: convert --numstat and --shortstat

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index 12e333c67f..419b6ac4ae 100644 --- a/diff.c +++ b/diff.c @@ -4905,6 +4905,12 @@ static void prep_parse_options(struct

[PATCH v2 06/21] diff-parseopt: convert --patch-with-stat

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 0276f25200..b9811aefef 100644 --- a/diff.c +++ b/diff.c @@ -4921,6 +4921,10 @@ static void prep_parse_options(struct dif

[PATCH v2 01/21] diff-parseopt: convert --patch-with-raw

2019-02-16 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 4bc9df7362..12e333c67f 100644 --- a/diff.c +++ b/diff.c @@ -4901,6 +4901,10 @@ static void prep_parse_options(struct dif

[PATCH v2 00/21] nd/diff-parseopt part 2

2019-02-16 Thread Nguyễn Thái Ngọc Duy
v2 changes the subject line to help clarify in "git log --oneline" Nguyễn Thái Ngọc Duy (21): diff-parseopt: convert --patch-with-raw diff-parseopt: convert --numstat and --shortstat diff-parseopt: convert --dirstat and friends diff-parseopt: convert --check diff-parseopt: convert --summ

[PATCH v2] completion: add more parameter value completion

2019-02-16 Thread Nguyễn Thái Ngọc Duy
This adds value completion for a couple more paramters. To make it easier to maintain these hard coded lists, add a comment at the original list/code to remind people to update git-completion.bash too. Signed-off-by: Nguyễn Thái Ngọc Duy --- apply.c| 4 +++ built

Debug.protocol

2019-02-16 Thread Rick kolinski
Sent from my iPad

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results)

2019-02-16 Thread Max Kirillov
On Fri, Feb 15, 2019 at 04:13:15PM -0500, Randall S. Becker wrote: > Sadly, the fix does not change the results. In fact, it > makes the hang far more likely. Subtest 6,7,8 fails here, > at close() Correct, I did not expect it to help, it was for the other issue. As for the hang issue, from your