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: downstream_latest_tag: Refer to HEAD instead of sc 

Fix getting the best tag in detached head state, when sc is not
up-to-date.

Change-Id: I50294b9de3134815deef30a4b1c61da81721de89
This commit is contained in:
SpiritCroc 2020-11-06 14:17:56 +01:00
parent 10e67bd5df
commit 786660f3bd
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_previous_tag() {
git describe --abbrev=0 `upstream_latest_tag`~1 --tags git describe --abbrev=0 `upstream_latest_tag`~1 --tags
} }
downstream_latest_tag() { downstream_latest_tag() {
local commit="sc" local commit="HEAD"
while true; do while true; do
local tag=`git describe --abbrev=0 "$commit" --tags` local tag=`git describe --abbrev=0 "$commit" --tags`
if [[ "$tag" =~ "sc_" ]]; then if [[ "$tag" =~ "sc_" ]]; then