Inicio Explorar Axuda
Rexistro Iniciar sesión
phyus
/
linux-vybrid_public
8
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

scripts/setlocalversion: update comment

A tagged repository state isn't enough, git describe only
looks at signed or annotated tags (git tag -a/-s). This
documentation update makes sure the comment matches the
current behaviour.

Signed-off-by: Michael Prokop <mika@grml.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Michael Prokop %!s(int64=14) %!d(string=hai) anos
pai
cbcf14a942
achega
c3e2f196f9
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 4 2
      scripts/setlocalversion

+ 4 - 2
scripts/setlocalversion
Ver ficheiro 

@@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
 
 	# full scm version string
 
 	# full scm version string
 
 	res="$res$(scm_version)"
 
 	res="$res$(scm_version)"
 
 else
 
 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
 
 	if test "${LOCALVERSION+set}" != "set"; then
 
 		scm=$(scm_version --short)
 
 		scm=$(scm_version --short)
 
 		res="$res${scm:++}"
 
 		res="$res${scm:++}"