1 files changed, 21 insertions, 6 deletions

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index f1c4b35bc324..00790472f641 100755
--- a/scripts/setlocalversion
+++ b/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,10 +18,17 @@ 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 version?
-        if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-                if tag=`git describe 2>/dev/null`; then
-                        echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+        # 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
@@ -21,7 +36,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 
         # Is this git on svn?
         if git config --get svn-remote.svn.url >/dev/null; then
-                printf -- '-svn%s' "`git-svn find-rev $head`"
+                printf -- '-svn%s' "`git svn find-rev $head`"
         fi
 
         # Are there uncommitted changes?