summaryrefslogtreecommitdiff
path: root/t/t9115/funky-names.dump
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-04 11:39:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-04 12:05:47 -0700
commit99694544358b74c14982f2b9769f8804f017672c (patch)
tree22d10c5f840ee9a7f9de07ff1da88cb06ea49a91 /t/t9115/funky-names.dump
parentMerge branch 'maint-1.7.0' into maint-1.7.1 (diff)
downloadtgif-99694544358b74c14982f2b9769f8804f017672c.tar.xz
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
The combined diff machinery can be used to compare: - a merge commit with its parent commits; - a working-tree file with multiple stages in an unmerged index; or - a working-tree file with the HEAD and the index. The internal function combine-diff.c:show_patch_diff() checked if it needs to read the "result" from the working tree by looking at the object name of the result --- if it is null_sha1, it read from the working tree. This mistook a merge that records a deletion as the conflict resolution as if it is a cue to read from the working tree. Pass this information explicitly from the caller instead. Noticed and reported by Johan Herland. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9115/funky-names.dump')
0 files changed, 0 insertions, 0 deletions