@matheusbsbs / matheus-bagliano / commits / 43d1948b7b

diff: handle --no-abbrev in no-index case

There are two different places where the --no-abbrev option is parsed, and two different places where SHA-1s are abbreviated. We normally parse --no-abbrev with setup_revisions(), but in the no-index case, "git diff" calls diff_opt_parse() directly, and diff_opt_parse() didn't handle --no-abbrev until now. (It did handle --abbrev, however.) We normally abbreviate SHA-1s with find_unique_abbrev(), but commit 4f03666 ("diff: handle sha1 abbreviations outside of repository, 2016-10-20) recently introduced a special case when you run "git diff" outside of a repository. setup_revisions() does also call diff_opt_parse(), but not for --abbrev or --no-abbrev, which it handles itself. setup_revisions() sets rev_info->abbrev, and later copies that to diff_options->abbrev. It handles --no-abbrev by setting abbrev to zero. (This change doesn't touch that.) Setting abbrev to zero was broken in the outside-of-a-repository special case, which until now resulted in a truly zero-length SHA-1, rather than taking zero to mean do not abbreviate. The only way to trigger this bug, however, was by running "git diff --raw" without either the --abbrev or --no-abbrev options, because 1) without --raw it doesn't respect abbrev (which is bizarre, but has been that way forever), 2) we silently clamp --abbrev=0 to MINIMUM_ABBREV, and 3) --no-abbrev wasn't handled until now. The outside-of-a-repository case is one of three no-index cases. The other two are when one of the files you're comparing is outside of the repository you're in, and the --no-index option. Signed-off-by: Jack Bates <jack@nottheoilrig.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jack Bates committed Dec 6, 2016 at 09:56 UTC 43d1948b7b84abc744227259dd1a3e8dfbb60358

8 files changed +39 -1

diff.c

+5 -1

@@ -3106,7 +3106,8 @@ static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)

3106 abbrev = FALLBACK_DEFAULT_ABBREV;

3107 if (abbrev > GIT_SHA1_HEXSZ)

3108 die("BUG: oid abbreviation out of range: %d", abbrev);

3109 - hex[abbrev] = '\0';

3109 + if (abbrev)

3110 + hex[abbrev] = '\0';

3111 return hex;

3112 }

3113 }

@@ -3364,6 +3365,7 @@ void diff_setup(struct diff_options *options)

3365

3366 options->file = stdout;

3367

3368 + options->abbrev = DEFAULT_ABBREV;

3369 options->line_termination = '\n';

3370 options->break_opt = -1;

3371 options->rename_limit = -1;

@@ -4024,6 +4026,8 @@ int diff_opt_parse(struct diff_options *options,

4026 offending, optarg);

4027 return argcount;

4028 }

4029 + else if (!strcmp(arg, "--no-abbrev"))

4030 + options->abbrev = 0;

4031 else if (!strcmp(arg, "--abbrev"))

4032 options->abbrev = DEFAULT_ABBREV;

4033 else if (skip_prefix(arg, "--abbrev=", &arg)) {

t/t4013-diff-various.sh

@@ -311,6 +311,13 @@ diff --line-prefix=abc master master^ side

311 diff --dirstat master~1 master~2

312 diff --dirstat initial rearrange

313 diff --dirstat-by-file initial rearrange

314 +# No-index --abbrev and --no-abbrev

315 +diff --raw initial

316 +diff --raw --abbrev=4 initial

317 +diff --raw --no-abbrev initial

318 +diff --no-index --raw dir2 dir

319 +diff --no-index --raw --abbrev=4 dir2 dir

320 +diff --no-index --raw --no-abbrev dir2 dir

321 EOF

322

323 test_expect_success 'log -S requires an argument' '

t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir new

@@ -0,0 +1,3 @@

1 +$ git diff --no-index --raw --abbrev=4 dir2 dir

2 +:000000 100644 0000... 0000... A dir/sub

3 +$

t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir new

@@ -0,0 +1,3 @@

1 +$ git diff --no-index --raw --no-abbrev dir2 dir

2 +:000000 100644 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 A dir/sub

3 +$

t/t4013/diff.diff_--no-index_--raw_dir2_dir new

@@ -0,0 +1,3 @@

1 +$ git diff --no-index --raw dir2 dir

2 +:000000 100644 0000000... 0000000... A dir/sub

3 +$

t/t4013/diff.diff_--raw_--abbrev=4_initial new

@@ -0,0 +1,6 @@

1 +$ git diff --raw --abbrev=4 initial

2 +:100644 100644 35d2... 9929... M dir/sub

3 +:100644 100644 01e7... 10a8... M file0

4 +:000000 100644 0000... b1e6... A file1

5 +:100644 000000 01e7... 0000... D file2

6 +$

t/t4013/diff.diff_--raw_--no-abbrev_initial new

@@ -0,0 +1,6 @@

1 +$ git diff --raw --no-abbrev initial

2 +:100644 100644 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 M dir/sub

3 +:100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0

4 +:000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A file1

5 +:100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D file2

6 +$

t/t4013/diff.diff_--raw_initial new

@@ -0,0 +1,6 @@

1 +$ git diff --raw initial

2 +:100644 100644 35d242b... 992913c... M dir/sub

3 +:100644 100644 01e79c3... 10a8a9f... M file0

4 +:000000 100644 0000000... b1e6722... A file1

5 +:100644 000000 01e79c3... 0000000... D file2

6 +$