projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d8ead15) | patch
t6042: Add a testcase where git deletes an untracked file
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:34 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commit695576fddd039b2fdc3cad52bbaab4d89e27b71c
treeed49ce8831903fdc7060a7e73871e422a924c4aetree | snapshot
parentd8ead15963890a42f99fd0e7f3192b55cacd9404commit | diff
t6042: Add a testcase where git deletes an untracked file

Current git will nuke an untracked file during a rename/delete conflict if
(a) there is an untracked file whose name matches the source of a rename
and (b) the merge is done in a certain direction.  Add a simple testcase
demonstrating this bug.

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