1 files changed, 7 insertions, 5 deletions

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5556cd..ef8729f48586 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -43,7 +43,7 @@ scm_version()
         fi
 
         # Check for git and a git repo.
-        if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+        if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 
                 # 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.
@@ -85,8 +85,8 @@ scm_version()
         fi
 
         # Check for mercurial and a mercurial repo.
-        if hgid=`hg id 2>/dev/null`; then
-                tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+        if test -d .hg && hgid=`hg id 2>/dev/null`; then
+                tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
 
                 # Do we have an untagged version?
                 if [ -z "$tag" -o "$tag" = tip ]; then
@@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
         # full scm version string
         res="$res$(scm_version)"
 else
-        # apped a plus sign if the repository is not in a clean tagged
-        # state and  LOCALVERSION= is not specified
+        # append a plus sign if the repository is not in a clean
+        # annotated or signed tagged state (as git describe only
+        # looks at signed or annotated tags - git tag -a/-s) and
+        # LOCALVERSION= is not specified
         if test "${LOCALVERSION+set}" != "set"; then
                 scm=$(scm_version --short)
                 res="$res${scm:++}"