| commit | 8063665b428c796a3689b4711a90b7fdb51d36d2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:36:54 +0000 (11 10:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:36:54 +0000 (11 10:36 -0700) | ||
| tree | faa3d24efb2007083046a85294b1c7f67eb59fe8 | treesnapshot (tar.gz zip) |
| parent | 1a18470cb8c6fbcf40b535cf669aa165844706d5 | commitdiff |
| parent | ad6e8ed37bc139c64b1b75a7a9ff6e4054f71756 | commitdiff |
Merge branch 'jc/apply-reject-noop-hunk' into next
"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 |