diff options
| -rwxr-xr-x | t/t7502-commit.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index c444812a4d..deb187eb7b 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -248,6 +248,8 @@ test_expect_success 'setup auto-ident prerequisite' ' sane_unset GIT_COMMITTER_NAME && git var GIT_COMMITTER_IDENT); then test_set_prereq AUTOIDENT + else + test_set_prereq NOAUTOIDENT fi ' @@ -269,6 +271,21 @@ echo editor started > "$(pwd)/.git/result" exit 0 EOF +test_expect_success NOAUTOIDENT '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 && |