| commit | 6fa690c347c9b4ca223008d0196c0ef47cdb9f27 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Aug 2012 20:57:05 +0000 (28 13:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Aug 2012 20:57:06 +0000 (28 13:57 -0700) | ||
| tree | 6bd11a30fda4abf9423177a682def08c58c31ca9 | treesnapshot (tar.gz zip) |
| parent | 8b9ac7c49ab59ef7572f2ffd5ee1337ef3e40ea8 | commitdiff |
| parent | 6a2abdc12516cd3801bceef4ccfba399c962a074 | commitdiff |
Merge branch 'jc/apply-binary-p0' into next
"git apply -p0" did not parse pathnames on "diff --git" line
correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or
mode changes have preimage and postimage pathnames in different
places in a form that can be parsed unambiguously and did not suffer
from this problem.
* jc/apply-binary-p0:
apply: compute patch->def_name correctly under -p0
"git apply -p0" did not parse pathnames on "diff --git" line
correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or
mode changes have preimage and postimage pathnames in different
places in a form that can be parsed unambiguously and did not suffer
from this problem.
* jc/apply-binary-p0:
apply: compute patch->def_name correctly under -p0
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4103-apply-binary.sh | diff1 | diff2 | blobhistory |