mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 07:46:19 +02:00
Code

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

"diff --no-index -Mq a b" fell into an infinite loop.

* jc/fix-diff-no-index-diff-opt-parse:
  diff-no-index: correctly diagnose error return from diff_opt_parse()
This commit is contained in:
Junio C Hamano 2014-04-03 12:38:42 -07:00
parent 8ba87adad6 ad1c3fbd26
commit 7b6bc4d835
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff-no-index.c
View File

@ -198,7 +198,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;
}