| commit | 59c465d5c01a16b29975aee59097efc349de6ab7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:39 +0000 (24 12:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:39 +0000 (24 12:21 -0700) | ||
| tree | 211427c2451aa1fa6456f2d194feed1c1378aebe | treesnapshot (tar.gz zip) |
| parent | 5b1d901c0173b41010856e30776c92d02987ea25 | commitdiff |
| parent | ad6e8ed37bc139c64b1b75a7a9ff6e4054f71756 | commitdiff |
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
"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
| builtin/apply.c | diff1 | diff2 | blobhistory |