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>

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8889ba5104cd3f7c783a179d45816d3a82685ef0..7c4c6335925d6fa1d383e7623ce937969b13cd79 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -135,12 +135,12 @@ test_pause () {
        fi
 }
 
        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
 #
 # 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= &&
 
 test_commit () {
        notick= &&


@@ -168,7 +168,7 @@ test_commit () {
                test_tick
        fi &&
        git commit $signoff -m "$1" &&
                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>
 }
 
 # Call test_merge with the arguments "<message> <commit>", where <commit>