merge_helpers.sh: Fix downstream_latest_tag if sc_v and sc_last are identical

Change-Id: I750b4ce873229de098988c5dbf94e0cfe6a57b82
2022-12-03 17:16:42 +01:00 · 2022-12-03 17:16:42 +01:00 · 0e2de3eadb
commit 0e2de3eadb
parent 7ffa6214a4
1 changed files with 2 additions and 2 deletions
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@ -99,8 +99,8 @@ upstream_previous_tag() {
 downstream_latest_tag() {
    local commit="HEAD"
    while true; do
-        local tag=`git describe --abbrev=0 "$commit" --tags`
-        if [[ "$tag" =~ "sc_v" ]]; then
+        local tag=`git tag --points-at "$commit" | grep "^sc_v" | head -n 1`
+        if [ ! -z "$tag" ]; then
            echo "$tag"
            break
        else