From 5c54d3cf239e7925325b88e0308edc1cab582bf4 Mon Sep 17 00:00:00 2001 From: nrb <freifunk@nicoboehr.de> Date: Mon, 14 Oct 2019 21:16:10 +0200 Subject: [PATCH] fix branch existence checking --- update-gluon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-gluon.sh b/update-gluon.sh index b589b05..94dae72 100755 --- a/update-gluon.sh +++ b/update-gluon.sh @@ -27,7 +27,7 @@ git fetch upstream --tags git branch -a # we already have this branch - exit -if ! git rev-parse --verify "$fork_newest_minor_branch" &> /dev/null; then +if [ "$(git ls-remote --heads "$gluon_fork_git_url" "$fork_newest_minor_branch" | wc -l)" -gt 0 ]; then echo "Nothing todo, branch $fork_newest_minor_branch already exists" exit 0 fi -- GitLab