From 0f335d78774d4a641cb25a175ed544eed26ae8b5 Mon Sep 17 00:00:00 2001
From: Nico Boehr <nico@nicoboehr.de>
Date: Fri, 12 May 2023 11:46:58 +0200
Subject: [PATCH] scripts: fix update-gluon
We were expecting a checked out branch which obviously isn't always the
case. Instread try and find a tag.
---
scripts/update-gluon.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/update-gluon.sh b/scripts/update-gluon.sh
index 385ac1d53..925bc0e87 100755
--- a/scripts/update-gluon.sh
+++ b/scripts/update-gluon.sh
@@ -30,8 +30,8 @@ git -C "$gluon_path" fetch origin --tags
git -C "$gluon_path" fetch upstream "$tag_to_update_to"
-current_branch_name=$(git -C "$gluon_path" rev-parse --abbrev-ref HEAD)
-current_upstream_tag_name=${current_branch_name/-ffs/}
+current_tag_name=$(git -C "$gluon_path" describe)
+current_upstream_tag_name=${current_tag_name/-ffs*/}
git -C "$gluon_path" checkout -b "$tag_to_update_to-ffs"
--
GitLab