From: Michael Prokop <mika@grml.org>
To: Michal Marek <mmarek@suse.cz>,
linux-kbuild@vger.kernel.org,
nico-linuxsetlocalversion@schottelius.org
Cc: Michael Prokop <mika@grml.org>
Subject: [PATCH] scripts/setlocalversion: update comment regarding information retrieval about git repository state
Date: Mon, 6 Sep 2010 11:57:19 +0200 [thread overview]
Message-ID: <1283767039-27872-1-git-send-email-mika@grml.org> (raw)
In-Reply-To: <4C80E5B9.3080405@suse.cz>
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>
---
scripts/setlocalversion | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 057b6b3..ef8729f 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:++}"
--
1.7.1
next prev parent reply other threads:[~2010-09-06 9:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 23:03 scripts/setlocalversion: information retrieval about git repository state Michael Prokop
2010-08-27 14:26 ` Michal Marek
2010-09-03 11:58 ` Michael Prokop
2010-09-03 12:10 ` Michal Marek
2010-09-06 9:57 ` Michael Prokop [this message]
2010-09-06 11:27 ` [PATCH] scripts/setlocalversion: update comment regarding " Michal Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283767039-27872-1-git-send-email-mika@grml.org \
--to=mika@grml.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=nico-linuxsetlocalversion@schottelius.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.