Skip to content

Commit

Permalink
scripts/setlocalversion: update comment
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
mika authored and michal42 committed Sep 6, 2010
1 parent cbcf14a commit c3e2f19
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions scripts/setlocalversion
Original file line number Diff line number Diff line change
Expand Up @@ -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:++}"
Expand Down

0 comments on commit c3e2f19

Please sign in to comment.