t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

Removing .dotest should actually not be needed, so just test the directory
don't exist after --abort, but exists after starting the rebase.

Also, execute the same tests with rebase --merge, which uses a different code
path.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t3407-rebase-abort.sh

@@ -23,37 +23,49 @@ test_expect_success setup '
 	git branch pre-rebase
 '
 
-test_expect_success 'rebase --abort' '
+testrebase() {
-	test_must_fail git rebase master &&
+	type=$1
-	git rebase --abort &&
+	dotest=$2
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
-'
 
-test_expect_success 'rebase --abort after --skip' '
+	test_expect_success "rebase$type --abort" '
-	# Clean up the state from the previous one
+		# Clean up the state from the previous one
-	git reset --hard pre-rebase
+		git reset --hard pre-rebase
-	rm -rf .dotest
+		test_must_fail git rebase'"$type"' master &&
+		test -d '$dotest' &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
 
-	test_must_fail git rebase master &&
+	test_expect_success "rebase$type --abort after --skip" '
-	test_must_fail git rebase --skip &&
+		# Clean up the state from the previous one
-	test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		git reset --hard pre-rebase
-	git rebase --abort &&
+		test_must_fail git rebase'"$type"' master &&
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
+		test -d '$dotest' &&
-'
+		test_must_fail git rebase --skip &&
+		test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		git-rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
 
-test_expect_success 'rebase --abort after --continue' '
+	test_expect_success "rebase$type --abort after --continue" '
-	# Clean up the state from the previous one
+		# Clean up the state from the previous one
-	git reset --hard pre-rebase
+		git reset --hard pre-rebase
-	rm -rf .dotest
+		test_must_fail git rebase'"$type"' master &&
+		test -d '$dotest' &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test $(git rev-parse HEAD) != $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d '$dotest'
+	'
+}
 
-	test_must_fail git rebase master &&
+testrebase "" .dotest
-	echo c > a &&
+testrebase " --merge" .git/.dotest-merge
-	echo d >> a &&
-	git add a &&
-	test_must_fail git rebase --continue &&
-	test $(git rev-parse HEAD) != $(git rev-parse master) &&
-	git rebase --abort &&
-	test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
-'
 
 test_done