diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:16 -0700 |
| commit | 693b407077bf3739b3609400845e3f6854830ee4 (patch) | |
| tree | 7a675dbdf79abc347f2d8c095fe7e7724cbeb4f7 | |
| parent | efb4ec68b82aa003e18c1731e17503d3bf8d15f4 (diff) | |
| parent | ad1c3fbd26d0aae50abfb3c7d654f7229ba9370d (diff) | |
| download | git-693b407077bf3739b3609400845e3f6854830ee4.tar.gz | |
Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint
* jc/fix-diff-no-index-diff-opt-parse:
diff-no-index: correctly diagnose error return from diff_opt_parse()
| -rw-r--r-- | diff-no-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 33e5982a1c..798477f7e5 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -202,7 +202,7 @@ void diff_no_index(struct rev_info *revs, i++; else { j = diff_opt_parse(&revs->diffopt, argv + i, argc - i); - if (!j) + if (j <= 0) die("invalid diff option/value: %s", argv[i]); i += j; } |