From c8c562a238071843c64ea0f3a2c85481606da379 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Mon, 1 Jun 2009 11:20:56 +0200 Subject: refuse to merge during a merge The following is an easy mistake to make for users coming from version control systems with an "update and commit"-style workflow. 1. git pull 2. resolve conflicts 3. git pull Step 3 overrides MERGE_HEAD, starting a new merge with dirty index. IOW, probably not what the user intended. Instead, refuse to merge again if a merge is in progress. Reported-by: Dave Olszewski Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- t/t3030-merge-recursive.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 't') diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 0de613dc5..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 ' -- cgit v1.2.1