Re: [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison

On 21 Sep 2017, at 23:28, Jonathan Nieder [off-list ref] wrote:

larsxschneider@gmail.com wrote:

quoted

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 <redacted>
Signed-off-by: Lars Schneider <redacted>
---

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).

quoted

--- 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.

Oh, you're right!

Could you squash in the following?

@Junio: Can you squash it when you apply the patch?

Thank you,
Lars