From c4e17a1bc4fe0200dcf5ba71a0a6ce2a2ed0de09 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Mon, 17 Jan 2022 21:27:44 +0100
Subject: [PATCH] Let sc.0.test.0 be the initial version after a merge
---
merge_helpers.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 4b7aed3..3808eab 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -162,7 +162,8 @@ get_current_versions() {
get_versions_string() {
versions_string="${versions[0]}-sc.${versions[1]}"
- if [[ ${versions[2]} -gt 0 ]]; then
+ # both zero means the initial version after a merge
+ if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
versions_string+=".test.${versions[2]}"
fi
}