| commit | 695576fddd039b2fdc3cad52bbaab4d89e27b71c | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:34 +0000 (11 23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:31 +0000 (14 14:19 -0700) | ||
| tree | ed49ce8831903fdc7060a7e73871e422a924c4ae | treesnapshot (tar.gz zip) |
| parent | d8ead15963890a42f99fd0e7f3192b55cacd9404 | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t6042-merge-rename-corner-cases.sh | [new file with mode: 0755] | blob |