From 8376eb4a8f4f5e048d6be3b54f9e13577f53eafa Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 21 Sep 2017 22:48:30 +0200 Subject: travis-ci: fix "skip_branch_tip_with_tag()" string comparison MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- ci/lib-travisci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1