Skip to content

Commit 24982d9

Browse files
committed
prepare-embargoed-branches: support A.B.C.D versions
Sometimes, Git for Windows has to go alone, and release several versions based on the same upstream version. In these instances, a version format like v2.47.0(2) is used. Let's support those, too. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f7f6a0b commit 24982d9

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

prepare-embargoed-branches.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,26 @@ version=${1#v}
2121
if test -z "$mingit"
2222
then
2323
case "$version" in
24+
*.*.*.windows.*)
25+
# major.minor.patch.windows.extra
26+
previous_version_prefix=${version%.windows.*}
27+
version="${version%.windows.*}.${version##*.windows.}"
28+
;;
29+
*.*.*\(*)
30+
# major.minor.patch(extra)
31+
previous_version_prefix=${version%(*}
32+
version="${version%(*}.${version##*(}"
33+
version=${version%)}
34+
;;
2435
*[^0-9.]*|*..*|.*|*.) die "Invalid version: '$version'";;
25-
*.*.*) ;; # okay
36+
*.*.*.*)
37+
# major.minor.patch.extra
38+
v0="${version#*.*.*.}"
39+
previous_version_prefix=${version%.$v0}
40+
;;
41+
*.*.*) previous_version_prefix=${version%.*}.$((${version##*.}-1));; # major.minor.patch
2642
*) die "Invalid version: '$version'";;
2743
esac
28-
previous_version_prefix=${version%.*}.$((${version##*.}-1))
2944
branch_name=git-$version
3045
else
3146
previous_version_prefix="$(expr "$version" : '\([0-9]\+\.[0-9]\+\)\.\{0,1\}[0-9]*$')"

0 commit comments

Comments
 (0)