diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-03 17:25:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:31:59 -0700 |
| commit | c5978a507ca20b12008724f78237784193fb9489 (patch) | |
| tree | 7d70ed40ebb26168df3f9d2fa8c61d3e4aefd208 /t/t7609-merge-co-error-msgs.sh | |
| parent | 5e65ee35ddd306d6e6c86efc1c95315942f87811 (diff) | |
| download | git-c5978a507ca20b12008724f78237784193fb9489.tar.gz git-c5978a507ca20b12008724f78237784193fb9489.tar.xz | |
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>
Diffstat (limited to 't/t7609-merge-co-error-msgs.sh')
| -rwxr-xr-x | 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 1a109b41d..114d2bd78 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 |