From 31f75e74c5cdfacb6ed58a885489ba45a5e858bf Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 6 Sep 2010 11:57:19 +0200
Subject: [PATCH] --- yaml --- r: 220546 b: refs/heads/master c:
 c3e2f196f9862cd75cb7f495a3cd1f1bbb82bb40 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fd6dcc924107..12d53e5e2fc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbcf14a942eb06d031628046739b983e84b383bf
+refs/heads/master: c3e2f196f9862cd75cb7f495a3cd1f1bbb82bb40
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index e90a91cc5185..dc54b1982958 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -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:++}"