From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:39 +0000 (-0700)
Subject: Merge branch 'jc/apply-reject-noop-hunk'
X-Git-Tag: v2.5.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c465d5c01a16b29975aee59097efc349de6ab7;p=thirdparty%2Fgit.git

Merge branch 'jc/apply-reject-noop-hunk'

"git apply" cannot diagnose a patch corruption when the breakage is
to mark the length of the hunk shorter than it really is on the
hunk header line "@@ -l,k +m,n @@"; one special case it could is
when the hunk becomes no-op (e.g. k == n == 2 for two-line context
patch output), and it learned how to do so.

* jc/apply-reject-noop-hunk:
  apply: reject a hunk that does not do anything
---

59c465d5c01a16b29975aee59097efc349de6ab7