From 786660f3bdb242896e959fda6a4fef1e686f7a1d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 6 Nov 2020 14:17:56 +0100 Subject: [PATCH] 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 --- merge_helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 0eba6911e2..f4f3997a7d 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -28,7 +28,7 @@ upstream_previous_tag() { git describe --abbrev=0 `upstream_latest_tag`~1 --tags } downstream_latest_tag() { - local commit="sc" + local commit="HEAD" while true; do local tag=`git describe --abbrev=0 "$commit" --tags` if [[ "$tag" =~ "sc_" ]]; then