X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7502-commit.sh;h=c25eff9e468acd628cf0a5e7a0968c801396e9f8;hb=e896912c5edb8f989a2d25e101b2eb14f1a56aa9;hp=ed871a6b4d7963f520b994f4d378b02194d69f9e;hpb=5f54de5bd07481f6d88e8dbd5551f3356ecbf513;p=git.git

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ed871a6b4..c25eff9e4 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -212,7 +212,11 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
 	# Must fail due to conflict
 	test_must_fail git cherry-pick -n master &&
 	echo "editor not started" >.git/result &&
-	test_must_fail GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" git commit &&
+	(
+		GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	) &&
 	test "$(cat .git/result)" = "editor not started"
 '