From: Brandon Casey <drafnel@gmail.com>
To: gitster@pobox.com
Cc: pclouds@gmail.com, git@vger.kernel.org,
Brandon Casey <drafnel@gmail.com>,
Brandon Casey <bcasey@nvidia.com>
Subject: [PATCH v2 02/10] t/test-lib-functions.sh: allow to specify the tag name to test_commit
Date: Mon, 21 Jan 2013 00:40:19 -0800 [thread overview]
Message-ID: <1358757627-16682-3-git-send-email-drafnel@gmail.com> (raw)
In-Reply-To: <1358757627-16682-1-git-send-email-drafnel@gmail.com>
The <message> part of test_commit() may not be appropriate for a tag name.
So let's allow test_commit to accept a fourth argument to specify the tag
name.
Signed-off-by: Brandon Casey <bcasey@nvidia.com>
---
t/test-lib-functions.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index fa62d01..c601918 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -135,12 +135,13 @@ test_pause () {
fi
}
-# Call test_commit with the arguments "<message> [<file> [<contents>]]"
+# Call test_commit with the arguments "<message> [<file> [<contents> [<tag>]]]"
#
# This will commit a file with the given contents and the given commit
-# message. It will also add a tag with <message> as name.
+# message. It will also add a tag with <message> as name unless <tag> is
+# given.
#
-# Both <file> and <contents> default to <message>.
+# <file>, <contents>, and <tag> all default to <message>.
test_commit () {
notick= &&
@@ -168,7 +169,7 @@ test_commit () {
test_tick
fi &&
git commit $signoff -m "$1" &&
- git tag "$1"
+ git tag "${4:-$1}"
}
# Call test_merge with the arguments "<message> <commit>", where <commit>
--
1.8.1.1.252.gdb33759
next prev parent reply other threads:[~2013-01-21 8:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 8:40 [PATCH v2 00/10] unify appending of sob Brandon Casey
2013-01-21 8:40 ` [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer Brandon Casey
2013-01-22 7:54 ` Jonathan Nieder
2013-01-22 9:35 ` Brandon Casey
2013-01-22 9:47 ` Jonathan Nieder
2013-01-22 9:49 ` Jonathan Nieder
2013-01-22 11:08 ` Brandon Casey
2013-01-22 10:12 ` Jonathan Nieder
2013-01-22 10:21 ` Jonathan Nieder
2013-01-21 8:40 ` Brandon Casey [this message]
2013-01-22 8:02 ` [PATCH v2 02/10] t/test-lib-functions.sh: allow to specify the tag name to test_commit Jonathan Nieder
2013-01-22 9:43 ` Brandon Casey
2013-01-21 8:40 ` [PATCH v2 03/10] t/t3511: add some tests of 'cherry-pick -s' functionality Brandon Casey
2013-01-22 8:17 ` Jonathan Nieder
2013-01-27 23:33 ` Brandon Casey
2013-01-27 23:40 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 04/10] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer Brandon Casey
2013-01-22 8:27 ` Jonathan Nieder
2013-01-28 1:24 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 05/10] sequencer.c: always separate "(cherry picked from" from commit body Brandon Casey
2013-01-22 8:32 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 06/10] sequencer.c: teach append_signoff how to detect duplicate s-o-b Brandon Casey
2013-01-22 8:38 ` Jonathan Nieder
2013-01-28 0:36 ` Brandon Casey
2013-01-28 2:06 ` Junio C Hamano
2013-02-09 23:06 ` Junio C Hamano
2013-02-09 23:49 ` Brandon Casey
2013-01-21 8:40 ` [PATCH v2 07/10] sequencer.c: teach append_signoff to avoid adding a duplicate newline Brandon Casey
2013-01-21 8:40 ` [PATCH v2 08/10] t4014: more tests about appending s-o-b lines Brandon Casey
2013-01-21 8:40 ` [PATCH v2 09/10] format-patch: update append_signoff prototype Brandon Casey
2013-01-21 8:40 ` [PATCH v2 10/10] Unify appending signoff in format-patch, commit and sequencer Brandon Casey
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=1358757627-16682-3-git-send-email-drafnel@gmail.com \
--to=drafnel@gmail.com \
--cc=bcasey@nvidia.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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.
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).