summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-one-octopus_branches-one
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:00:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:00:53 -0700
commit1403db49b80630cf8c36ba3e8b0f085ea0ab8286 (patch)
treedc7e01049a14a36188e1837d2b3ed002dc88402f /t/t5515/fetch.br-branches-one-octopus_branches-one
parentMerge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 (diff)
parentapply: compute patch->def_name correctly under -p0 (diff)
downloadtgif-1403db49b80630cf8c36ba3e8b0f085ea0ab8286.tar.xz
Merge branch 'jc/apply-binary-p0' into maint-1.7.11
"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
Diffstat (limited to 't/t5515/fetch.br-branches-one-octopus_branches-one')
0 files changed, 0 insertions, 0 deletions