summaryrefslogtreecommitdiff
path: root/t/t5513-fetch-track.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-13 15:51:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-26 14:46:15 -0800
commit35ffe7583108ab236dcf81226690388491d9962f (patch)
tree7e10e89e49f8c7184486d965d3544d515afa389b /t/t5513-fetch-track.sh
parentmerge-tree: add comments to clarify what these functions are doing (diff)
downloadtgif-35ffe7583108ab236dcf81226690388491d9962f.tar.xz
merge-tree: fix d/f conflicts
The previous commit documented two known breakages revolving around a case where one side flips a tree into a blob (or vice versa), where the original code simply gets confused and feeds a mixture of trees and blobs into either the recursive merge-tree (and recursing into the blob will fail) or three-way merge (and merging tree contents together with blobs will fail). Fix it by feeding trees (and only trees) into the recursive merge-tree machinery and blobs (and only blobs) into the three-way content level merge machinery separately; when this happens, the entire merge has to be marked as conflicting at the structure level. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5513-fetch-track.sh')
0 files changed, 0 insertions, 0 deletions