[PATCH] t7609-merge-co-error-msgs: test non-fast forward case too.
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Sep 3, 2010, 15:25 UTC
- Message-ID
- <1283527533-16736-1-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <8762ymewq5.fsf@meyering.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- This comes on top of the patch serie, and adds a test to make sure the bug doesn't come back.
I did check manually that the git of git.git doesn't pass this (while the one after the patch serie does).
t/t7609-merge-co-error-msgs.sh | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index 1a109b4..6b58299 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -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
-- 1.7.2.2.284.g95cc.dirty