merge_helpers.sh: upstream_previous_tag: fix if merge not on sc

Change-Id: Ib13460fd12afec1c7aa69eee7a2a4ded1485ec8c
2021-10-06 09:14:57 +02:00 · 2021-10-06 09:14:57 +02:00 · c6c5b123d6
parent 8c4ef3d9cf
commit c6c5b123d6
1 changed files with 1 additions and 1 deletions
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@ -28,7 +28,7 @@ upstream_latest_tag() {
 upstream_previous_tag() {
    #git describe --abbrev=0 `upstream_latest_tag`~1 --tags
    #downstream_latest_tag | sed 's|sc_\(v.*\).sc.*|\1|'
-    git log | grep "Merge tag 'v.*' into sc" | head -n 1 |sed "s|.*Merge tag '\\(v.*\\)' into sc|\1|"
+    git log | grep "Merge tag 'v.*' into " | head -n 1 |sed "s|.*Merge tag '\\(v.*\\)' into .*|\1|"
 }
 downstream_latest_tag() {
    local commit="HEAD"