projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b4ed59) | patch
t6042: Add a testcase where undetected rename causes silent file deletion
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:37 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commita0551f212edd13e3df0d3dcd5abf148e0f003e59
tree2da1ca000f7229a0e365ca9d4100c80c7ce9550dtree | snapshot
parent7b4ed5941c0d2143cb4467a9e265993121b62ce7commit | diff
t6042: Add a testcase where undetected rename causes silent file deletion

There are cases where history should merge cleanly, and which current git
does merge cleanly despite not detecting a rename; however the merge
currently nukes files that should not be removed.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6042-merge-rename-corner-cases.sh diff | blob | history
Git—the stupid content tracker