X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7609-merge-co-error-msgs.sh;h=114d2bd7855f71ec1d48f2017438f897c5255d36;hb=5501bf854ce6a3847ef0de6f6aa63f6b93e82b67;hp=1a109b41dc6d538490d62dd9421fd1aea0c9eb7f;hpb=bc38219f50ba9228945fba8e900d636f15082f16;p=git.git

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