Re: [PATCH 0/5] Revamping "git status"

From

Thomas Rast <trast@student.ethz.ch>

Date

Aug 5, 2009, 17:40 UTC

Message-ID

<200908051940.48110.trast@student.ethz.ch>

In-Reply-To

<200908051937.36255.trast@student.ethz.ch>

Thomas Rast wrote:

> +test_expect_failure '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 &&
> +	git merge master &&
> +	git status
> +'
> +

-- 8< --

diff --git i/t/t7060-wtstatus.sh w/t/t7060-wtstatus.sh
index 5ad2cd1..a152a26 100755
--- i/t/t7060-wtstatus.sh
+++ w/t/t7060-wtstatus.sh
@@ -28,4 +28,17 @@ test_expect_success 'Report new path with conflict' '
 	test_cmp expect actual
 '
 
+test_expect_failure '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 &&
+	git status
+'
+
 test_done
-- >8 --

Sorry for all the confusion.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch