Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-11-24 13:34:50 +0000
committerCode Review2011-11-24 13:34:50 +0000
commitb4495d1005e6e03e921ed116614ec45499f1923d (patch)
tree1773a59e25b49a1f6e3220f84a6bce3e69f0be88
parent3d76a805ee488fa48fdfc1926b1a704ee7182cb5 (diff)
parent8d88a842da58a7689c16e9529a000cb5267320ba (diff)
downloadjgit-b4495d1005e6e03e921ed116614ec45499f1923d.tar.gz
jgit-b4495d1005e6e03e921ed116614ec45499f1923d.tar.xz
jgit-b4495d1005e6e03e921ed116614ec45499f1923d.zip
Merge "tools/release: Handle v1.0.0.201106090707-r-NN-gdeadbeef"
-rwxr-xr-xtools/version.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/version.sh b/tools/version.sh
index 1ed6c01b69..2fae5e1427 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -82,7 +82,7 @@ case "$V" in
*-[1-9]*-g[0-9a-f]*)
POM_V=$(echo "$V" | perl -pe 's/-(\d+-g.*)$/.$1/')
OSGI_V=$(perl -e '
- $ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?)?-(\d+)-g(.*)$/;
+ die unless $ARGV[0] =~ /^(\d+)(?:\.(\d+)(?:\.(\d+))?(?:\.\d{12}-r)?)?-(\d+)-g(.*)$/;
my ($a, $b, $c, $p, $r) = ($1, $2, $3, $4, $5);
$b = '0' unless defined $b;
$c = '0' unless defined $c;

Back to the top