Re: [PATCH 0/5] Revamping "git status"
flat view
From: Thomas Rast <hidden>
Date: 2016-06-15 22:47:09
Thomas Rast wrote:
quoted hunk ↗ jump to hunk
+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 +' +
Meh, this stops before the git-status because merge signals a conflict. However, the following really crashes. Promise. -- 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