t7607: clean up stray untracked file
This file ends up conflicting with the test just after it (causing the "git merge" to fail). Neither test is to blame for the bug, though. It looks like the merge in 1a9fe45 (Merge branch 'tr/merge-unborn-clobber', 2011-02-09) is what caused the conflict. We didn't notice because the follow-on test is already marked as expect_failure (even though it has since been fixed, and now succeeds once the untracked file is moved out of the way). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 25, 2011 at 14:09 UTC
d6d9e76d7f06c5ba94517d258e051544885780c5
1 file changed
+2
-1
t/t7607-merge-overwrite.sh
+2
-1
@@ -150,6 +150,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
150
git rm -fr . &&
151
git checkout --orphan new &&
152
cp important c0.c &&
153
+ test_when_finished "rm c0.c" &&
154
test_must_fail git merge c0 2>out &&
155
test_cmp out expect &&
156
test_path_is_missing .git/MERGE_HEAD &&
@@ -164,7 +165,7 @@ test_expect_success 'set up unborn branch and content' '
165
echo bar > untracked-file
166
'
167
167
-test_expect_failure 'will not clobber WT/index when merging into unborn' '
168
+test_expect_success 'will not clobber WT/index when merging into unborn' '
169
git merge master &&
170
grep foo tracked-file &&
171
git show :tracked-file >expect &&