X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ftest-lib-functions.sh;h=b299ecc3265357bfb38e2131854b02868b5e9e0e;hb=c555caab7a303109d6c712d757bc4621a3ee0bbd;hp=87bf3a2287381be4586eccd94cce35c0a3b3d60f;hpb=6e12570822a904e2be554b05755c08f4d24be7e9;p=thirdparty%2Fgit.git

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 87bf3a2287..b299ecc326 100644
--- 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>