---

yaml --- r: 106524 b: refs/heads/master c: 56b2f07 h: refs/heads/master v: v3
git-mirror · Jul 25, 2008 · 2e4a77e · 2e4a77e
1 parent 20e2f89
commit 2e4a77e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d2b8f951063076c7e0acdff7ae1fecd54920a0
+refs/heads/master: 56b2f0706d82535fd8d85503f2dcc0be40c8e55d
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
@@ -12,7 +12,9 @@ cd "${1:-.}" || usage
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	# Do we have an untagged version?
 	if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-	        git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+		if tag=`git describe 2>/dev/null`; then
+			echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+		fi
 	fi
 
 	# Are there uncommitted changes?