From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Apr 2014 19:38:42 +0000 (-0700)
Subject: Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
X-Git-Tag: v2.0.0-rc0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b6bc4d8350029fed82824a33ea9039f22788eec;p=thirdparty%2Fgit.git

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()
---

7b6bc4d8350029fed82824a33ea9039f22788eec