diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2011-06-24 14:09:20 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2011-06-24 14:09:20 -0700 |
| commit | 8d88a842da58a7689c16e9529a000cb5267320ba (patch) | |
| tree | 0f33e09808be62c22dfa0eb0ee8408f03d1fec40 /tools | |
| parent | 1eecc82cec2409ed3b69cf96f3206a2fb6c7b9f1 (diff) | |
| download | jgit-8d88a842da58a7689c16e9529a000cb5267320ba.tar.gz jgit-8d88a842da58a7689c16e9529a000cb5267320ba.zip | |
tools/release: Handle v1.0.0.201106090707-r-NN-gdeadbeef
The 1.0.0 release tags have a new suffix.
Account for this.
Change-Id: Ic6f260b6a5ba353af3b312b722f576155208eaa0
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/version.sh | 2 |
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; |