From 2e4a77e3d2f2530aa9cab539a6e0fdafae7717fa Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <lkml@ml.breakpoint.cc>
Date: Wed, 2 Jul 2008 00:18:08 +0200
Subject: [PATCH] --- yaml --- r: 106524 b: refs/heads/master c:
 56b2f0706d82535fd8d85503f2dcc0be40c8e55d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/setlocalversion | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2c82851baad9..faed48f16df3 100644
--- 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
index 1c1bdaf7348a..83b75126c9f7 100755
--- 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?