filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pre_merge.sh: Fix when last merge was not tagged 

Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
This commit is contained in:
SpiritCroc 2021-04-09 11:48:29 +02:00
parent 8f378aafea
commit 61e9bfce5b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge_helpers.sh
View File

@ -27,7 +27,8 @@ upstream_latest_tag() {
} }
upstream_previous_tag() { 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 | 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() { downstream_latest_tag() {
local commit="HEAD" local commit="HEAD"

2
pre_merge.sh
View File

@ -9,7 +9,7 @@ source "$mydir/merge_helpers.sh"
require_clean_git require_clean_git
# Revert Schildi's upstream string changes # 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" git commit -m "Automatic revert to unchanged upstream strings, pt.1"
# Keep in sync with post_merge.sh! # Keep in sync with post_merge.sh!