summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLibravatar Lars Schneider <larsxschneider@gmail.com>2017-09-21 22:48:30 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-22 10:58:29 +0900
commit8376eb4a8f4f5e048d6be3b54f9e13577f53eafa (patch)
treea5103b5bd221cf835a58dda80fd1d59c8d5fd9fa /ci
parenttravis: dedent a few scripts that are indented overly deeply (diff)
downloadtgif-8376eb4a8f4f5e048d6be3b54f9e13577f53eafa.tar.xz
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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/lib-travisci.sh2
1 files changed, 1 insertions, 1 deletions
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