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

merge_helpers.sh: upstream_previous_tag: fix if merge not on sc 

Change-Id: Ib13460fd12afec1c7aa69eee7a2a4ded1485ec8c
This commit is contained in:
SpiritCroc 2021-10-06 09:14:57 +02:00
parent 8c4ef3d9cf
commit c6c5b123d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge_helpers.sh
View File

@ -28,7 +28,7 @@ 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|" git log | grep "Merge tag 'v.*' into " | head -n 1 |sed "s|.*Merge tag '\\(v.*\\)' into .*|\1|"
} }
downstream_latest_tag() { downstream_latest_tag() {
local commit="HEAD" local commit="HEAD"