mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 23:56:20 +02:00
Code

t7609-merge-co-error-msgs: test non-fast forward case too. 

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2010-09-03 17:25:33 +02:00 committed by Junio C Hamano
parent 5e65ee35dd
commit c5978a507c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t7609-merge-co-error-msgs.sh
View File

@ -34,9 +34,17 @@ error: The following untracked working tree files would be overwritten by merge:
Please move or remove them before you can merge.
EOF
test_expect_success 'untracked files overwritten by merge' '
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
test_must_fail git merge branch 2>out &&
test_cmp out expect
test_cmp out expect &&
git commit --allow-empty -m empty &&
(
GIT_MERGE_VERBOSITY=0 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
test_cmp out2 expect &&
git reset --hard HEAD^
'
cat >expect <<\EOF