From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org, Thomas Rast <trast@student.ethz.ch>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCHv2 2/8] t7502: factor out autoident prerequisite
Date: Wed, 14 Nov 2012 16:33:40 -0800 [thread overview]
Message-ID: <20121115003340.GB17819@sigill.intra.peff.net> (raw)
In-Reply-To: <20121115003029.GA17550@sigill.intra.peff.net>
t7502 checks the behavior of commit when we can and cannot
determine a valid committer ident. Let's move that into
test-lib as a lazy prerequisite so other scripts can use it.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t7502-commit.sh | 12 +-----------
t/test-lib.sh | 6 ++++++
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index deb187e..1a5cb69 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -243,16 +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
- else
- test_set_prereq NOAUTOIDENT
- fi
-'
-
test_expect_success AUTOIDENT 'message shows committer when it is automatic' '
echo >>negative &&
@@ -271,7 +261,7 @@ echo editor started > "$(pwd)/.git/result"
exit 0
EOF
-test_expect_success NOAUTOIDENT 'do not fire editor when committer is bogus' '
+test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
>.git/result
>expect &&
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 489bc80..0334a9e 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -738,6 +738,12 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
esac
'
+test_lazy_prereq AUTOIDENT '
+ sane_unset GIT_AUTHOR_NAME &&
+ sane_unset GIT_AUTHOR_EMAIL &&
+ git var GIT_AUTHOR_IDENT
+'
+
# When the tests are run as root, permission tests will report that
# things are writable when they shouldn't be.
test -w / || test_set_prereq SANITY
--
1.8.0.207.gdf2154c
next prev parent reply other threads:[~2012-11-15 0:33 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-11 17:06 [PATCH] send-email: add proper default sender Felipe Contreras
2012-11-11 17:12 ` Ramkumar Ramachandra
2012-11-11 18:06 ` Felipe Contreras
2012-11-12 23:35 ` Jeff King
2012-11-12 23:42 ` Felipe Contreras
2012-11-13 0:02 ` Jeff King
2012-11-13 0:06 ` Jeff King
2012-11-13 0:55 ` Junio C Hamano
2012-11-13 0:54 ` Felipe Contreras
2012-11-13 3:27 ` Jeff King
2012-11-13 3:40 ` Jeff King
2012-11-13 3:55 ` Felipe Contreras
2012-11-13 4:01 ` Jeff King
2012-11-13 6:42 ` Felipe Contreras
2012-11-13 7:18 ` Felipe Contreras
2012-11-13 7:47 ` Jeff King
2012-11-13 9:06 ` Felipe Contreras
2012-11-13 16:48 ` Jeff King
2012-11-13 16:49 ` [PATCH 1/6] ident: make user_ident_explicitly_given private Jeff King
2012-11-14 16:44 ` Jonathan Nieder
2012-11-14 19:11 ` Jeff King
2012-11-13 16:52 ` [PATCH 2/6] ident: keep separate "explicit" flags for author and committer Jeff King
2012-11-13 16:52 ` [PATCH 3/6] var: accept multiple variables on the command line Jeff King
2012-11-14 17:01 ` Jonathan Nieder
2012-11-14 19:26 ` Jeff King
2012-11-13 16:53 ` [PATCH 4/6] var: provide explicit/implicit ident information Jeff King
2012-11-14 17:06 ` Jonathan Nieder
2012-11-14 19:53 ` Jeff King
2012-11-13 16:53 ` [PATCH 5/6] Git.pm: teach "ident" to query explicitness Jeff King
[not found] ` <20121113172300.GA16241@ftbfs.org>
2012-11-13 17:25 ` Jeff King
2012-11-14 17:12 ` Jonathan Nieder
2012-11-14 19:54 ` Jeff King
2012-11-13 16:53 ` [PATCH 6/6] send-email: do not prompt for explicit repo ident Jeff King
2012-11-14 17:18 ` Jonathan Nieder
2012-11-14 20:05 ` Jeff King
2012-11-14 20:26 ` Jeff King
2012-11-13 20:35 ` [PATCH] send-email: add proper default sender Felipe Contreras
2012-11-15 0:07 ` Jeff King
2012-11-15 1:41 ` Felipe Contreras
2012-11-15 1:50 ` Jeff King
2012-11-15 2:14 ` Felipe Contreras
2012-11-15 0:30 ` [PATCHv2 0/8] loosening "sender" prompt in send-email Jeff King
2012-11-15 0:33 ` [PATCHv2 1/8] test-lib: allow negation of prerequisites Jeff King
2012-11-15 7:46 ` Jonathan Nieder
2012-11-15 16:42 ` Jeff King
2012-11-15 16:49 ` Jonathan Nieder
2012-11-15 0:33 ` Jeff King [this message]
2012-11-15 7:49 ` [PATCHv2 2/8] t7502: factor out autoident prerequisite Jonathan Nieder
2012-11-15 0:34 ` [PATCHv2 3/8] ident: make user_ident_explicitly_given static Jeff King
2012-11-15 7:51 ` Jonathan Nieder
2012-11-15 0:34 ` [PATCHv2 4/8] ident: keep separate "explicit" flags for author and committer Jeff King
2012-11-15 8:04 ` Jonathan Nieder
2012-11-15 0:35 ` [PATCHv2 5/8] var: accept multiple variables on the command line Jeff King
2012-11-15 8:10 ` Jonathan Nieder
2012-11-15 0:35 ` [PATCHv2 6/8] var: provide explicit/implicit ident information Jeff King
2012-11-15 0:36 ` [PATCHv2 7/8] Git.pm: teach "ident" to query explicitness Jeff King
2012-11-15 8:13 ` Jonathan Nieder
2012-11-15 0:36 ` [PATCHv2 8/8] send-email: do not prompt for explicit repo ident Jeff King
2012-11-15 2:08 ` Felipe Contreras
2012-11-15 8:33 ` Jeff King
2012-11-15 10:28 ` Felipe Contreras
2012-11-15 10:43 ` Jeff King
2012-11-15 11:13 ` Jeff King
2012-11-15 11:50 ` Jeff King
2012-11-15 16:56 ` Junio C Hamano
2012-11-15 17:28 ` Jeff King
2012-11-16 5:17 ` Junio C Hamano
2012-11-16 19:08 ` Jeff King
2012-11-16 19:57 ` Felipe Contreras
2012-11-16 20:11 ` Jeff King
2012-11-16 20:04 ` Junio C Hamano
2012-11-15 8:23 ` Jonathan Nieder
2012-11-13 16:13 ` [PATCH] send-email: add proper default sender Junio C Hamano
2012-11-13 17:14 ` Jeff King
2012-11-13 17:23 ` Junio C Hamano
2012-11-13 17:20 ` Erik Faye-Lund
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121115003340.GB17819@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=trast@student.ethz.ch \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).