git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ba87ad ad1c3fb)
Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
authorJunio C Hamano <redacted>
Thu, 3 Apr 2014 19:38:42 +0000 (12:38 -0700)
committerJunio C Hamano <redacted>
Thu, 3 Apr 2014 19:38:42 +0000 (12:38 -0700)
"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()

1  2 
diff-no-index.c patch | diff1 | diff2 | blob | history

diff --cc diff-no-index.c
Simple merge
git clone https://git.99rst.org/PROJECT