merge_helpers.sh: upstream_previous_tag: for previous downstream tag

Change-Id: I2204c727d825aa1f14e5051f607bb7ea8dc4b6e3
2020-12-12 14:09:49 +01:00 · 2020-12-12 14:09:49 +01:00 · da6547cedd
parent 1f35c3619c
commit da6547cedd
1 changed files with 2 additions and 1 deletions
--- 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"