summaryrefslogtreecommitdiff
path: root/preload-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 11:47:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 11:48:26 -0700
commitad1c3fbd26d0aae50abfb3c7d654f7229ba9370d (patch)
tree5d6cd777569113a94d32580d3580dd713f5f1305 /preload-index.c
parentGit 1.8.5.5 (diff)
downloadtgif-ad1c3fbd26d0aae50abfb3c7d654f7229ba9370d.tar.xz
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>
Diffstat (limited to 'preload-index.c')
0 files changed, 0 insertions, 0 deletions