Merge branch 'mv/parseopt-checkout-index'

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ed871a6b4d7963f520b994f4d378b02194d69f9e..3eb9faedcf75c7b8a535b369e5a19107c6e81026 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -141,8 +141,8 @@ test_expect_success 'cleanup commit messages (strip,-F)' '
 
 echo "sample
 
-# Please enter the commit message for your changes.
-# (Comment lines starting with '#' will not be included)" >expect
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit." >expect
 
 test_expect_success 'cleanup commit messages (strip,-F,-e)' '
 
@@ -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"
 '
 
@@ -224,10 +228,12 @@ EOF
 
 test_expect_success 'a SIGTERM should break locks' '
        echo >>negative &&
-       "$SHELL_PATH" -c '\''
+       ! "$SHELL_PATH" -c '\''
          echo kill -TERM $$ >> .git/FAKE_EDITOR
-         GIT_EDITOR=.git/FAKE_EDITOR exec git commit -a'\'' && exit 1  # should fail
-       ! test -f .git/index.lock
+         GIT_EDITOR=.git/FAKE_EDITOR
+         export GIT_EDITOR
+         exec git commit -a'\'' &&
+       test ! -f .git/index.lock
 '
 
 rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG