Re: [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 21, 2017, 21:28 UTC
- Message-ID
- <20170921212848.GJ27425@aiede.mtv.corp.google.com>
- In-Reply-To
- <20170921204830.66831-1-larsxschneider@gmail.com>
larsxschneider@gmail.com wrote:
Show 7 quoted lines
> 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>
> ---Thanks for the fix.
09f5e97 appears to be for the ls/travis-scriptify branch, which is already part of "next" (if it weren't, I'd suggest just squashing your patch into that commit).
Show 8 quoted lines
> --- 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
> + [ "$TAG" != "$TRAVIS_BRANCH" ]Git style is to use 'test' instead of '[' for this. See https://public-inbox.org/git/2f3cdc85-f051-c0ae-b9db-fd13cac78aed@gmail.com/ for more on that subject.
Could you squash in the following?
Thanks, Jonathan
diff --git i/ci/lib-travisci.sh w/ci/lib-travisci.sh index c3b46f4a7d..b3ed0a0dda 100755 --- i/ci/lib-travisci.sh +++ w/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