---

yaml --- r: 220546 b: refs/heads/master c: c3e2f19 h: refs/heads/master v: v3
git-mirror · Sep 6, 2010 · 31f75e7 · 31f75e7
1 parent bd96c7d
commit 31f75e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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:++}"