Meta/V & Meta/Doit: adjust to exact release

Junio C Hamano · Junio C Hamano · commit 15ef670d68e1 · 2007-04-03T01:53:25.000-07:00
"git version" would not have g suffix for an exact release.
diff --git a/Doit b/Doit
@@ -1,7 +1,12 @@
 #!/bin/sh
 
 : ${J=-j2}
-while case "$1" in -pedantic) M=$1 ;; *) break ;; esac
+force=
+while	case "$1" in
+	-pedantic) M=$1 ;;
+	-force) force=$1 ;;
+	*) break ;;
+	esac
 do
 	shift
 done
@@ -17,18 +22,23 @@ Meta/Make clean >/dev/null 2>&1
 nstall=install
 for branch in $branches
 do
+	echo >&3 "** $branch **"
+
 	revision=$(git show-ref -s --verify "refs/heads/$branch") || {
 		echo "** No $branch"
 		continue
 	}
 
-	if	installed=$($HOME/git-$branch/bin/git version) &&
-		version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') &&
-		version=$(git rev-parse --verify "$version") &&
+	if	installed=$($HOME/git-$v/bin/git version) &&
+		{
+			version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
+			version=v$(expr "$installed" : 'git version \(.*\)')
+		} &&
+		version=$(git rev-parse --verify "$version^0") &&
 		test "z$version" = "z$revision"
 	then
 		echo "* up-to-date version \"$installed\" is already installed from $branch"
-		continue
+		test -n "$force" || continue
 	fi
 
 	echo "** $branch" &&
@@ -38,7 +48,7 @@ do
 	Meta/Make $M -- test &&
 	Meta/Make clean || exit $?
 
-done >./:all.log 2>&1
+done >./:all.log 3>&2 2>&1
 
 git checkout master
 
diff --git a/V b/V
@@ -3,8 +3,10 @@
 for v in maint master next pu
 do
 	installed=$($HOME/git-$v/bin/git version)
-	version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
-	version=$(git rev-parse --verify "$version")
+	version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
+	version=v$(expr "$installed" : 'git version \(.*\)')
+
+	version=$(git rev-parse --verify "$version^0")
 	revision=$(git show-ref -s --verify "refs/heads/$v")
 	if test "z$version" = "z$revision"
 	then
