Merge branch 'bw/format-patch-o-create-leading-dirs'

[thirdparty/git.git] / t / test-lib-functions.sh

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 87bf3a2287381be4586eccd94cce35c0a3b3d60f..b299ecc3265357bfb38e2131854b02868b5e9e0e 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -228,9 +228,11 @@ test_commit () {
 # can be a tag pointing to the commit-to-merge.
 
 test_merge () {
+       label="$1" &&
+       shift &&
        test_tick &&
-       git merge -m "$1" "$2" &&
-       git tag "$1"
+       git merge -m "$label" "$@" &&
+       git tag "$label"
 }
 
 # Efficiently create <nr> commits, each with a unique number (from 1 to <nr>