X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3030-merge-recursive.sh;h=9b3fa2bdcd9bebae46a000ffe9c2059cea5a93fd;hb=1c92a08f286453bd28a1f6153249b2e2cf63cb38;hp=de0cdb1cf4e4dbb6395619bdd2f56c0b027fdea7;hpb=94c27881bd98d5bb70e3d4f8a18e384095c876b9;p=git.git

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index de0cdb1cf..9b3fa2bdc 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -276,6 +276,9 @@ test_expect_success 'fail if the index has unresolved entries' '
 
 	test_must_fail git merge "$c5" &&
 	test_must_fail git merge "$c5" 2> out &&
+	grep "You have not concluded your merge" out &&
+	rm -f .git/MERGE_HEAD &&
+	test_must_fail git merge "$c5" 2> out &&
 	grep "You are in the middle of a conflicted merge" out
 
 '
@@ -535,4 +538,15 @@ test_expect_success 'reset and bind merge' '
 
 '
 
+test_expect_success 'merge removes empty directories' '
+
+	git reset --hard master &&
+	git checkout -b rm &&
+	git rm d/e &&
+	git commit -mremoved-d/e &&
+	git checkout master &&
+	git merge -s recursive rm &&
+	test_must_fail test -d d
+'
+
 test_done