]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ba87ad ad1c3fb)
Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 19:38:42 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 19:38:42 +0000 (12:38 -0700)
commit7b6bc4d8350029fed82824a33ea9039f22788eec
treecfa3c083958735e0f1b64809aa71db7b24d694eftree | snapshot
parent8ba87adad637b402fb309754e213ec40b74e4f18commit | diff
parentad1c3fbd26d0aae50abfb3c7d654f7229ba9370dcommit | diff
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.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.