From 5d7a1605dae6fdb0ca7f0766dc8ec60e45a073a2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 12 Apr 2021 16:01:39 +0200 Subject: [PATCH] merge_helpers.sh: Fix spaces for upstream_previous_tag Change-Id: I669fd7e764419c9c78c15d7a3c5e5a6ce8af4af4 --- merge_helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index e3842750dc..da56916b80 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 sc" | head -n 1 |sed "s|.*Merge tag '\\(v.*\\)' into sc|\1|" } downstream_latest_tag() { local commit="HEAD"