reset: allow reset on unborn branch

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index c444812a4d51f8f5f5ce991eeea658794eac1f25..1a5cb6983c527b6d3e1ad6fad427d3513e8704b1 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -243,14 +243,6 @@ test_expect_success 'message shows author when it is not equal to committer' '
          .git/COMMIT_EDITMSG
 '
 
-test_expect_success 'setup auto-ident prerequisite' '
-       if (sane_unset GIT_COMMITTER_EMAIL &&
-           sane_unset GIT_COMMITTER_NAME &&
-           git var GIT_COMMITTER_IDENT); then
-               test_set_prereq AUTOIDENT
-       fi
-'
-
 test_expect_success AUTOIDENT 'message shows committer when it is automatic' '
 
        echo >>negative &&
@@ -269,6 +261,21 @@ echo editor started > "$(pwd)/.git/result"
 exit 0
 EOF
 
+test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
+       >.git/result
+       >expect &&
+
+       echo >>negative &&
+       (
+               sane_unset GIT_COMMITTER_EMAIL &&
+               sane_unset GIT_COMMITTER_NAME &&
+               GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
+               export GIT_EDITOR &&
+               test_must_fail git commit -e -m sample -a
+       ) &&
+       test_cmp expect .git/result
+'
+
 test_expect_success 'do not fire editor in the presence of conflicts' '
 
        git clean -f &&