Junio C Hamano 59c465d5c0 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

2015-06-24 12:21:39 -07:00

119 KiB

Raw Blame History

View Raw