X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7060-wtstatus.sh;h=1044aa65494f6c908aa4d70c1590a5577b288f50;hb=6ea71fe7d36cf5b81c2100d97a822ecf0bc04746;hp=5ad2cd1d049271e4cfda6e5033d45d92d8268076;hpb=29796c6ccff3e70622398379fdcdfa3fe43333ac;p=git.git

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 5ad2cd1d0..1044aa654 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -28,4 +28,31 @@ test_expect_success 'Report new path with conflict' '
 	test_cmp expect actual
 '
 
+cat >expect <<EOF
+# On branch side
+# Unmerged paths:
+#   (use "git reset HEAD <file>..." to unstage)
+#   (use "git add <file>..." to mark resolution)
+#
+#	deleted by us:      foo
+#
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+
+test_expect_success 'M/D conflict does not segfault' '
+	mkdir mdconflict &&
+	(
+		cd mdconflict &&
+		git init &&
+		test_commit initial foo "" &&
+		test_commit modify foo foo &&
+		git checkout -b side HEAD^ &&
+		git rm foo &&
+		git commit -m delete &&
+		test_must_fail git merge master &&
+		test_must_fail git status > ../actual
+	) &&
+	test_cmp expect actual
+'
+
 test_done