diff options
| author | Michael Prokop <mika@grml.org> | 2010-09-06 13:57:19 +0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-06 15:26:30 +0400 |
| commit | c3e2f196f9862cd75cb7f495a3cd1f1bbb82bb40 (patch) | |
| tree | 16b2d2d444960286ea1062abfe4cf22ac648176f | |
| parent | cbcf14a942eb06d031628046739b983e84b383bf (diff) | |
| download | linux-c3e2f196f9862cd75cb7f495a3cd1f1bbb82bb40.tar.xz | |
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>
| -rwxr-xr-x | scripts/setlocalversion | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index e90a91cc5185..dc54b1982958 100755 --- a/scripts/setlocalversion +++ b/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:++}" |