Fix Meta/V and Meta/Doit for exactly tagged versions.

Junio C Hamano · Junio C Hamano · commit 2fc378a31521 · 2007-05-10T17:05:12.000-07:00
diff --git a/Doit b/Doit
@@ -29,10 +29,17 @@ do
 	}
 
 	if	installed=$($HOME/git-$branch/bin/git version) &&
-		{
-			version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
+		if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
+		then
+			:
+		elif version=v$(expr "$installed" : \
+				'git version \(.*\)\.rc[0-9]*$')
+		then
+			version="$version"-$(expr "$installed" : \
+				'git version .*\.\(rc[0-9]*\)$')
+		else
 			version=v$(expr "$installed" : 'git version \(.*\)')
-		} &&
+		fi &&
 		version=$(git rev-parse --verify "$version^0" 2>/dev/null) &&
 		test "z$version" = "z$revision"
 	then
diff --git a/V b/V
@@ -3,8 +3,17 @@
 for v in maint master next pu
 do
 	installed=$($HOME/git-$v/bin/git version)
-	version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
-	version=v$(expr "$installed" : 'git version \(.*\)')
+	if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
+	then
+		:
+	elif version=v$(expr "$installed" : \
+			'git version \(.*\)\.rc[0-9]*$')
+	then
+		version="$version"-$(expr "$installed" : \
+			'git version .*\.\(rc[0-9]*\)$')
+	else
+		version=v$(expr "$installed" : 'git version \(.*\)')
+	fi
 
 	version=$(git rev-parse --verify "$version^0" 2>/dev/null)
 	revision=$(git show-ref -s --verify "refs/heads/$v")
