Skip to content

Commit cc8523e

Browse files
authored
Merge pull request #131 from git-for-windows/prepare-embargoed-branches-for-old-versions
prepare-embargoed-branches: special-case some older release trains
2 parents 12bc70e + 62979d5 commit cc8523e

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

prepare-embargoed-branches.sh

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@ then
3232
version="${version%(*}.${version##*(}"
3333
version=${version%)}
3434
;;
35-
*[^0-9.]*|*..*|.*|*.) die "Invalid version: '$version'";;
35+
*[!0-9.]*|*..*|.*|*.) die "Invalid version: '$version'";;
3636
*.*.*.*)
3737
# major.minor.patch.extra
3838
v0="${version#*.*.*.}"
39-
previous_version_prefix=${version%.$v0}
39+
previous_version=${version%.$v0}
40+
previous_version_prefix=$previous_version
4041
;;
41-
*.*.*) previous_version_prefix=${version%.*}.$((${version##*.}-1));; # major.minor.patch
42+
*.*.*)
43+
previous_version=${version%.*}.$((${version##*.}-1))
44+
previous_version_prefix=$previous_version
45+
;; # major.minor.patch
4246
*) die "Invalid version: '$version'";;
4347
esac
4448
branch_name=git-$version
@@ -47,6 +51,18 @@ else
4751
test -n "$previous_version_prefix" || die "Invalid version: '$version'"
4852
branch_name=mingit-$previous_version_prefix.x-releases
4953
fi
54+
case "$previous_version" in
55+
2.46.3)
56+
# There was no Git for Windows v2.46.3, so we use v2.46.2
57+
previous_version=2.46.2
58+
previous_version_prefix=2.46.2
59+
;;
60+
2.47.2)
61+
# There was no Git for Windows v2.47.2, so we use v2.47.1(2)
62+
previous_version=2.47.1.2
63+
previous_version_prefix=2.47.1
64+
;;
65+
esac
5066
grep_version_regex="$(echo "$previous_version_prefix" | sed 's/\./\\\\&/g')"
5167

5268
handle_repo () {

0 commit comments

Comments
 (0)