summaryrefslogtreecommitdiff
path: root/t/test-lib-functions.sh
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-02-12 02:17:30 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-12 11:08:54 -0800
commit4c9941943bebbe23039254cdda576ecd97e1d397 (patch)
treee20569fb33cde0fcfde41d7ba8cb99f90f9bcfac /t/test-lib-functions.sh
parent9b1515220912b4e436145babf0b5887ecbfb0ac4 (diff)
downloadgit-4c9941943bebbe23039254cdda576ecd97e1d397.tar.gz
t/test-lib-functions.sh: allow to specify the tag name to test_commit
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> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib-functions.sh')
-rw-r--r--t/test-lib-functions.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8889ba5104..7c4c633592 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -135,12 +135,12 @@ 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, and tag the resulting commit with the given tag name.
#
-# Both <file> and <contents> default to <message>.
+# <file>, <contents>, and <tag> all default to <message>.
test_commit () {
notick= &&
@@ -168,7 +168,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>