From 61e9bfce5b96f9ac1ae70f9ab5b6862e2e7a738c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 9 Apr 2021 11:48:29 +0200 Subject: [PATCH] pre_merge.sh: Fix when last merge was not tagged Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9 --- merge_helpers.sh | 3 ++- pre_merge.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index f9a723e509..e3842750dc 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -27,7 +27,8 @@ upstream_latest_tag() { } upstream_previous_tag() { #git describe --abbrev=0 `upstream_latest_tag`~1 --tags - downstream_latest_tag | sed 's|sc_\(v.*\).sc.*|\1|' + #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|" } downstream_latest_tag() { local commit="HEAD" diff --git a/pre_merge.sh b/pre_merge.sh index 8e254efb6c..ce038a8d9b 100755 --- a/pre_merge.sh +++ b/pre_merge.sh @@ -9,7 +9,7 @@ source "$mydir/merge_helpers.sh" require_clean_git # Revert Schildi's upstream string changes -git checkout `upstream_previous_tag` -- `find "$mydir/vector/src/main/res" -name strings.xml` +git checkout `upstream_previous_tag` -- "$mydir/vector/src/main/res/**/strings.xml" git commit -m "Automatic revert to unchanged upstream strings, pt.1" # Keep in sync with post_merge.sh!