Merge branch 'jc/diff-ws-error-highlight'

gitster · gitster · commit abecddea25e9 · 2015-07-15T12:30:14.000-07:00
A hotfix to a new feature in 2.5.0-rc.

* jc/diff-ws-error-highlight:
  diff: parse ws-error-highlight option more strictly
diff --git a/diff.c b/diff.c
@@ -3653,7 +3653,12 @@ static void enable_patch_output(int *fmt) {
 
 static int parse_one_token(const char **arg, const char *token)
 {
-	return skip_prefix(*arg, token, arg) && (!**arg || **arg == ',');
+	const char *rest;
+	if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
+		*arg = rest;
+		return 1;
+	}
+	return 0;
 }
 
 static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)

Original file line number	Diff line number	Diff line change
`@@ -3653,7 +3653,12 @@ static void enable_patch_output(int *fmt) {`
`3653`	`3653`
`3654`	`3654`	`static int parse_one_token(const char *arg, const char token)`
`3655`	`3655`	`{`
`3656`		`- return skip_prefix(arg, token, arg) && (!arg \|\| *arg == ',');`
	`3656`	`+ const char *rest;`
	`3657`	`+ if (skip_prefix(arg, token, &rest) && (!rest \|\| *rest == ',')) {`
	`3658`	`+ *arg = rest;`
	`3659`	`+ return 1;`
	`3660`	`+ }`
	`3661`	`+ return 0;`
`3657`	`3662`	`}`
`3658`	`3663`
`3659`	`3664`	`static int parse_ws_error_highlight(struct diff_options opt, const char arg)`