@matheusbsbs / matheus-bagliano / commits / ad1c3fbd26

diff-no-index: correctly diagnose error return from diff_opt_parse()

diff_opt_parse() returns the number of options parsed, or often returns error() which is defined to return -1. Yes, return value of 0 is "I did not process that option at all", which should cause the caller to say that, but negative return should not be forgotten. This bug caused "diff --no-index" to infinitely show the same error message because the returned value was used to decrement the loop control variable, e.g. $ git diff --no-index --color=words a b error: option `color' expects "always", "auto", or "never" error: option `color' expects "always", "auto", or "never" ... Instead, make it act like so: $ git diff --no-index --color=words a b error: option `color' expects "always", "auto", or "never" fatal: invalid diff option/value: --color=words Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 31, 2014 at 11:47 UTC ad1c3fbd26d0aae50abfb3c7d654f7229ba9370d

1 file changed +1 -1

diff-no-index.c

+1 -1

@@ -244,7 +244,7 @@ void diff_no_index(struct rev_info *revs,

244 i++;

245 else {

246 j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);

247 - if (!j)

247 + if (j <= 0)

248 die("invalid diff option/value: %s", argv[i]);

249 i += j;

250 }