From b8686f2e9ff898f22bfc9c58c6b8bd54a006caff Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico-linux-20090330@schottelius.org>
Date: Sat, 16 May 2009 14:00:56 +0200
Subject: [PATCH] --- yaml --- r: 145121 b: refs/heads/master c:
 33252572e727ccdcc54efdb67157e7ab3d6942db h: refs/heads/master i:   145119:
 781bc90a1d28d2002eb94abd6c23c823fdd3b268 v: v3

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

diff --git a/[refs] b/[refs]
index 24453f68e39c..f98519343064 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 279e677faa775ad16e75c32e1bf4a37f8158bc61
+refs/heads/master: 33252572e727ccdcc54efdb67157e7ab3d6942db
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index 32c8554f3946..00790472f641 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -1,5 +1,13 @@
 #!/bin/sh
-# Print additional version information for non-release trees.
+#
+# This scripts adds local version information from the version
+# control systems git, mercurial (hg) and subversion (svn).
+#
+# If something goes wrong, send a mail the kernel build mailinglist
+# (see MAINTAINERS) and CC Nico Schottelius
+# <nico-linuxsetlocalversion -at- schottelius.org>.
+#
+#
 
 usage() {
 	echo "Usage: $0 [srctree]" >&2
@@ -10,12 +18,20 @@ cd "${1:-.}" || usage
 
 # Check for git and a git repo.
 if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-	# Do we have an untagged tag?
-	if atag=`git describe 2>/dev/null`; then
-		echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
-	# add -g${head}, if there is no usable tag
-	else
-		printf '%s%s' -g $head
+
+	# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,
+	# because this version is defined in the top level Makefile.
+	if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+
+		# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
+		# we pretty print it.
+		if atag="`git describe 2>/dev/null`"; then
+			echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+		# If we don't have a tag at all we print -g{commitish}.
+		else
+			printf '%s%s' -g $head
+		fi
 	fi
 
 	# Is this git on svn?