Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint

gitster · gitster · commit 693b407077bf · 2014-04-09T11:59:16.000-07:00
* jc/fix-diff-no-index-diff-opt-parse:
  diff-no-index: correctly diagnose error return from diff_opt_parse()
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ void diff_no_index(struct rev_info *revs,`
`202`	`202`	`i++;`
`203`	`203`	`else {`
`204`	`204`	`j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);`
`205`		`- if (!j)`
	`205`	`+ if (j <= 0)`
`206`	`206`	`die("invalid diff option/value: %s", argv[i]);`
`207`	`207`	`i += j;`
`208`	`208`	`}`