| commit | 7b6bc4d8350029fed82824a33ea9039f22788eec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 19:38:42 +0000 (3 12:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 19:38:42 +0000 (3 12:38 -0700) | ||
| tree | cfa3c083958735e0f1b64809aa71db7b24d694ef | treesnapshot (tar.gz zip) |
| parent | 8ba87adad637b402fb309754e213ec40b74e4f18 | commitdiff |
| parent | ad1c3fbd26d0aae50abfb3c7d654f7229ba9370d | commitdiff |
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()
"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()
| diff-no-index.c | diff1 | diff2 | blobhistory |