From c6c5b123d633dbccd8942488af9145b0d28ce4a0 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 6 Oct 2021 09:14:57 +0200
Subject: [PATCH] merge_helpers.sh: upstream_previous_tag: fix if merge not on
 sc

Change-Id: Ib13460fd12afec1c7aa69eee7a2a4ded1485ec8c
---
 merge_helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_helpers.sh b/merge_helpers.sh
index 87cc0e7d7b..fcbade32fa 100755
--- 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"