Fix Meta/V and Meta/Doit for exactly tagged versions.
Junio C Hamano committed
May 10, 2007 at 17:02 UTC
2fc378a31521b60e4f11e8e97d49ce3c60c3285e
2 files changed
+21
-5
Doit
+10
-3
@@ -29,10 +29,17 @@ do
29
}
30
31
if installed=$($HOME/git-$branch/bin/git version) &&
32
- {
33
- version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
32
+ if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
33
+ then
34
+ :
35
+ elif version=v$(expr "$installed" : \
36
+ 'git version \(.*\)\.rc[0-9]*$')
37
+ then
38
+ version="$version"-$(expr "$installed" : \
39
+ 'git version .*\.\(rc[0-9]*\)$')
40
+ else
41
version=v$(expr "$installed" : 'git version \(.*\)')
35
- } &&
42
+ fi &&
43
version=$(git rev-parse --verify "$version^0" 2>/dev/null) &&
44
test "z$version" = "z$revision"
45
then
V
+11
-2
@@ -3,8 +3,17 @@
3
for v in maint master next pu
4
do
5
installed=$($HOME/git-$v/bin/git version)
6
- version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
7
- version=v$(expr "$installed" : 'git version \(.*\)')
6
+ if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
7
+ then
8
+ :
9
+ elif version=v$(expr "$installed" : \
10
+ 'git version \(.*\)\.rc[0-9]*$')
11
+ then
12
+ version="$version"-$(expr "$installed" : \
13
+ 'git version .*\.\(rc[0-9]*\)$')
14
+ else
15
+ version=v$(expr "$installed" : 'git version \(.*\)')
16
+ fi
17
18
version=$(git rev-parse --verify "$version^0" 2>/dev/null)
19
revision=$(git show-ref -s --verify "refs/heads/$v")