From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jiang Xin <worldhello.net@gmail.com>, Git List <git@vger.kernel.org>
Subject: [PATCH 6/6] t7502: test early quit from commit with bad ident
Date: Thu, 26 Jul 2012 16:32:50 -0400 [thread overview]
Message-ID: <20120726203250.GF16048@sigill.intra.peff.net> (raw)
In-Reply-To: <20120726202644.GA15043@sigill.intra.peff.net>
In commit f20f387, "git commit" notices and dies much
earlier when we have a bogus commit identity. That commit
did not add a test because we cannot do so reliably (namely,
we can only trigger the behavior on a system where the
automatically generated identity is bogus). However, now
that we have a prerequisite check for this feature, we can
add a test that will at least run on systems that produce
such a bogus identity.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t7502-commit.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index c444812..deb187e 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 &&
--
1.7.11.3.8.ge78f547
next prev parent reply other threads:[~2012-07-26 20:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 6:27 Test "t/t7502-commit.sh" failed Jiang Xin
2012-07-26 13:03 ` Jeff King
2012-07-26 16:34 ` Junio C Hamano
2012-07-26 17:12 ` Jeff King
2012-07-26 19:25 ` Junio C Hamano
2012-07-26 19:33 ` Jeff King
2012-07-26 20:04 ` Junio C Hamano
2012-07-26 20:26 ` [PATCH 0/6] t7502 fixes Jeff King
2012-07-26 20:27 ` [PATCH 1/6] t7502: clean up fake_editor tests Jeff King
2012-07-26 20:28 ` [PATCH 2/6] t7502: properly quote GIT_EDITOR Jeff King
2012-07-26 20:30 ` [PATCH 3/6] t7502: narrow checks for author/committer name in template Jeff King
2012-07-26 20:31 ` [PATCH 4/6] t7502: drop confusing test_might_fail call Jeff King
2012-07-26 20:32 ` [PATCH 5/6] t7502: handle systems where auto-identity is broken Jeff King
2012-07-26 20:32 ` Jeff King [this message]
2012-07-26 21:15 ` [PATCH 0/6] t7502 fixes Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120726203250.GF16048@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).