Merge branch 'maint'

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ed871a6b4d7963f520b994f4d378b02194d69f9e..c25eff9e468acd628cf0a5e7a0968c801396e9f8 100755 (executable)
--- 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"
 '