From: Lars Schneider <larsxschneider@gmail.com>
Date: Thu, 21 Sep 2017 20:48:30 +0000 (+0200)
Subject: travis-ci: fix "skip_branch_tip_with_tag()" string comparison
X-Git-Tag: v2.15.0-rc0~59^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8376eb4a8f4f5e048d6be3b54f9e13577f53eafa;p=thirdparty%2Fgit.git

travis-ci: fix "skip_branch_tip_with_tag()" string comparison

09f5e97 ("travis-ci: skip a branch build if equal tag is present",
2017-09-17) introduced the "skip_branch_tip_with_tag" function with
a broken string comparison. Fix it!

Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 9c4ae9bdd0..b3ed0a0dda 100755
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -14,7 +14,7 @@ skip_branch_tip_with_tag () {
 	# of a tag.
 
 	if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
-		$TAG != $TRAVIS_BRANCH
+		test "$TAG" != "$TRAVIS_BRANCH"
 	then
 		echo "Tip of $TRAVIS_BRANCH is exactly at $TAG"
 		exit 0