Meta/V & Meta/Doit: adjust to exact release
"git version" would not have g suffix for an exact release.
Junio C Hamano committed
Apr 3, 2007 at 01:53 UTC
15ef670d68e19bd4e1860508c8ff6a74800bc181
2 files changed
+20
-8
Doit
+16
-6
@@ -1,7 +1,12 @@
1
#!/bin/sh
2
3
: ${J=-j2}
4
-while case "$1" in -pedantic) M=$1 ;; *) break ;; esac
4
+force=
5
+while case "$1" in
6
+ -pedantic) M=$1 ;;
7
+ -force) force=$1 ;;
8
+ *) break ;;
9
+ esac
10
do
11
shift
12
done
@@ -17,18 +22,23 @@ Meta/Make clean >/dev/null 2>&1
22
nstall=install
23
for branch in $branches
24
do
25
+ echo >&3 "** $branch **"
26
+
27
revision=$(git show-ref -s --verify "refs/heads/$branch") || {
28
echo "** No $branch"
29
continue
30
}
31
25
- if installed=$($HOME/git-$branch/bin/git version) &&
26
- version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') &&
27
- version=$(git rev-parse --verify "$version") &&
32
+ if installed=$($HOME/git-$v/bin/git version) &&
33
+ {
34
+ version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
35
+ version=v$(expr "$installed" : 'git version \(.*\)')
36
+ } &&
37
+ version=$(git rev-parse --verify "$version^0") &&
38
test "z$version" = "z$revision"
39
then
40
echo "* up-to-date version \"$installed\" is already installed from $branch"
31
- continue
41
+ test -n "$force" || continue
42
fi
43
44
echo "** $branch" &&
@@ -38,7 +48,7 @@ do
48
Meta/Make $M -- test &&
49
Meta/Make clean || exit $?
50
41
-done >./:all.log 2>&1
51
+done >./:all.log 3>&2 2>&1
52
53
git checkout master
54
V
+4
-2
@@ -3,8 +3,10 @@
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=$(git rev-parse --verify "$version")
6
+ version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
7
+ version=v$(expr "$installed" : 'git version \(.*\)')
8
+
9
+ version=$(git rev-parse --verify "$version^0")
10
revision=$(git show-ref -s --verify "refs/heads/$v")
11
if test "z$version" = "z$revision"
12
then