Merge branch 'jc/apply-binary-p0'
commit757bf26c8512c21e841f75d16be624eb7fb4272c
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:26 +0000 (7 11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:26 +0000 (7 11:09 -0700)
treef09cb50a0724430813fb7e3272652c1e1dfd8639
parent7764a3b35c53b6859963ddad92bfc90563ac8baa
parent6a2abdc12516cd3801bceef4ccfba399c962a074
Merge branch 'jc/apply-binary-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
t/t4103-apply-binary.sh