* [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison
@ 2017-09-21 20:48 larsxschneider
2017-09-21 21:28 ` Jonathan Nieder
0 siblings, 1 reply; 4+ messages in thread
From: larsxschneider @ 2017-09-21 20:48 UTC (permalink / raw)
To: git; +Cc: szeder.dev, gitster, Lars Schneider
From: Lars Schneider <larsxschneider@gmail.com>
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>
---
Hi,
previous discussion:
https://public-inbox.org/git/3B175D35-5B1C-43CD-A7E9-85693335B10A@gmail.com/
Sorry that this trivial fix took so long.
Cheers,
Lars
Notes:
Base Commit: a81423d7cf (a81423d7cfdc57238783f05394dddd1064c99165)
Diff on Web: https://github.com/larsxschneider/git/commit/6b532a42f0
Checkout: git fetch https://github.com/larsxschneider/git travisci/fix-skip-branch-v1 && git checkout 6b532a42f0
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..c3b46f4a7d 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
+ [ "$TAG" != "$TRAVIS_BRANCH" ]
then
echo "Tip of $TRAVIS_BRANCH is exactly at $TAG"
exit 0
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison
2017-09-21 20:48 [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison larsxschneider
@ 2017-09-21 21:28 ` Jonathan Nieder
2017-09-21 22:26 ` Lars Schneider
0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Nieder @ 2017-09-21 21:28 UTC (permalink / raw)
To: larsxschneider; +Cc: git, szeder.dev, gitster
larsxschneider@gmail.com wrote:
> 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).
> --- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison
2017-09-21 21:28 ` Jonathan Nieder
@ 2017-09-21 22:26 ` Lars Schneider
2017-09-22 1:57 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Lars Schneider @ 2017-09-21 22:26 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, szeder.dev, gitster
> On 21 Sep 2017, at 23:28, Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> larsxschneider@gmail.com wrote:
>
>> 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).
>
>> --- 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
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison
2017-09-21 22:26 ` Lars Schneider
@ 2017-09-22 1:57 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2017-09-22 1:57 UTC (permalink / raw)
To: Lars Schneider; +Cc: Jonathan Nieder, git, szeder.dev
Lars Schneider <larsxschneider@gmail.com> writes:
> Oh, you're right!
>
>
>> Could you squash in the following?
>
> @Junio: Can you squash it when you apply the patch?
I do not mind and I already did.
The patches in the series this patch is fixing up were solely about
splitting these scripts out of the YAML file as-is, and I think it
was correct to carry these style differences over without adjusting
them.
But resulting scripts in ci/ are riddled with styleguide deviations,
which may want to be cleaned up later. There also are some
bash-isms marked with "#!env bash" in them, but I think they are OK
because we know we are running them only at a very specific place
and the need to make them portable is very small.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-22 1:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-21 20:48 [PATCH v1] travis-ci: fix "skip_branch_tip_with_tag()" string comparison larsxschneider
2017-09-21 21:28 ` Jonathan Nieder
2017-09-21 22:26 ` Lars Schneider
2017-09-22 1:57 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).