Re: [PATCH v3 4/9] t5520: test for failure if index has unresolved entries

Paul Tan [off-list ref] writes:

+test_expect_success 'fail if the index has unresolved entries' '
+	git checkout -b third second^ &&
+	test_when_finished "git checkout -f copy && git branch -D third" &&
+	verbose test "$(cat file)" = file &&
+	echo modified2 >file &&
+	git commit -a -m modified2 &&
+	verbose test -z "$(git ls-files -u)" &&
+	test_must_fail git pull . second &&
+	verbose test -n "$(git ls-files -u)" &&
+	cp file expected &&
+	test_must_fail git pull . second 2>err &&
+	test_i18ngrep "you have unmerged files" err &&
+	test_cmp expected file &&
+	git add file &&
+	verbose test -z "$(git ls-files -u)" &&
+	test_must_fail git pull . second 2>err &&
+	test_i18ngrep "have not concluded your merge" err &&

Reading this, I'm actually thinking that the message may have been
better written as "You have not concluded your previous merge". But
that's definitely out of the scope of this patch.

Anyway, the patch looks good to me, thanks.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/