undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
A hotfix to a new feature in 2.5.0-rc.

* jc/diff-ws-error-highlight:
  diff: parse ws-error-highlight option more strictly
This commit is contained in:
Junio C Hamano 2015-07-15 12:30:14 -07:00
commit abecddea25
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diff.c
View File

@ -3653,7 +3653,12 @@ static void enable_patch_output(int *fmt) {
static int parse_one_token(const char **arg, const char *token) 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) static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)