From da6547ceddb7b27dcf62898fafa3d1d2f6567e8d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 12 Dec 2020 14:09:49 +0100
Subject: [PATCH] merge_helpers.sh: upstream_previous_tag: for previous
 downstream tag

Change-Id: I2204c727d825aa1f14e5051f607bb7ea8dc4b6e3
---
 merge_helpers.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/merge_helpers.sh b/merge_helpers.sh
index f4f3997a7d..b302955eb2 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -25,7 +25,8 @@ upstream_latest_tag() {
     git describe --abbrev=0 upstream/master --tags
 }
 upstream_previous_tag() {
-    git describe --abbrev=0 `upstream_latest_tag`~1 --tags
+    #git describe --abbrev=0 `upstream_latest_tag`~1 --tags
+    downstream_latest_tag | sed 's|sc_\(v.*\).sc.*|\1|'
 }
 downstream_latest_tag() {
     local commit="HEAD"