merge_helpers.sh: Fix some tagging logic

Change-Id: I81ae8acd49b8069b658b4cc5acfef0e9e2b35825
2020-09-10 11:11:01 +02:00 · 2020-09-10 11:11:01 +02:00 · 8cba674d01
parent 5e4d9c18be
commit 8cba674d01
1 changed files with 12 additions and 3 deletions
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@ -19,13 +19,22 @@ require_clean_git() {
 }

 upstream_latest_tag() {
-    git describe upstream/master --tags
+    git describe --abbrev=0 upstream/master --tags
 }
 upstream_previous_tag() {
-    git describe `upstream_latest_tag`~1 --tags
+    git describe --abbrev=0 `upstream_latest_tag`~1 --tags
 }
 downstream_latest_tag() {
-    git describe sc --tags
+    local commit="sc"
+    while true; do
+        local tag=`git describe --abbrev=0 "$commit" --tags`
+        if [[ "$tag" =~ "sc_" ]]; then
+            echo "$tag"
+            break
+        else
+            commit="$commit^1"
+        fi
+    done
 }

 upstream_diff() {