X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3412-rebase-root.sh;h=5869061c5bfdee4a84b156b8ec9d6e331a2c906c;hb=419272d87b7a611ea55736c284df9615d22ec6af;hp=57a3cad2d93b472aaea5542e39c2171c2542bef6;hpb=f39e4cfa2ec2bab4175cee3a9e806d8b65161c75;p=git.git

diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 57a3cad2d..086c91c7b 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -6,10 +6,6 @@ Tests if git rebase --root --onto <newparent> can rebase the root commit.
 '
 . ./test-lib.sh
 
-# we always run the interactive rebases unchanged, so just disable the editor
-GIT_EDITOR=:
-export GIT_EDITOR
-
 log_with_names () {
 	git rev-list --topo-order --parents --pretty="tformat:%s" HEAD |
 	git name-rev --stdin --name-only --refs=refs/heads/$1
@@ -177,14 +173,14 @@ EOF
 test_expect_success 'pre-rebase hook stops rebase' '
 	git checkout -b stops1 other &&
 	test_must_fail git rebase --root --onto master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
 	test 0 = $(git rev-list other...stops1 | wc -l)
 '
 
 test_expect_success 'pre-rebase hook stops rebase -i' '
 	git checkout -b stops2 other &&
 	test_must_fail git rebase --root --onto master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
 	test 0 = $(git rev-list other...stops2 | wc -l)
 '