From: "René Scharfe." <l.s.r@web.de>
To: Eli Schwartz <eschwartz@archlinux.org>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] pretty: add merge and exclude options to %(describe)
Date: Sun, 14 Feb 2021 11:10:57 +0100 [thread overview]
Message-ID: <b7bd37c4-ab13-0297-da46-716e26de10d6@web.de> (raw)
In-Reply-To: <5561d11b-08c3-bcf7-5d37-a7d6c6bfb715@web.de>
Allow restricting the tags used by the placeholder %(describe) with the
options match and exclude. E.g. the following command describes the
current commit using official version tags, without those for release
candidates:
$ git log -1 --format='%(describe:match=v[0-9]*,exclude=*rc*)'
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Documentation/pretty-formats.txt | 13 ++++++++--
pretty.c | 43 ++++++++++++++++++++++++++++++--
t/t4205-log-pretty-formats.sh | 16 ++++++++++++
3 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index bb8c05bc21..231010e6ef 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -208,8 +208,17 @@ The placeholders are:
'%cs':: committer date, short format (`YYYY-MM-DD`)
'%d':: ref names, like the --decorate option of linkgit:git-log[1]
'%D':: ref names without the " (", ")" wrapping.
-'%(describe)':: human-readable name, like linkgit:git-describe[1];
- empty string for undescribable commits
+'%(describe[:options])':: human-readable name, like
+ linkgit:git-describe[1]; empty string for
+ undescribable commits. The `describe` string
+ may be followed by a colon and zero or more
+ comma-separated options.
++
+** 'match=<pattern>': Only consider tags matching the given
+ `glob(7)` pattern, excluding the "refs/tags/" prefix.
+** 'exclude=<pattern>': Do not consider tags matching the given
+ `glob(7)` pattern, excluding the "refs/tags/" prefix.
+
'%S':: ref name given on the command line by which the commit was reached
(like `git log --source`), only works with `git log`
'%e':: encoding
diff --git a/pretty.c b/pretty.c
index a0c427fb61..c612d2ac9b 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1150,6 +1150,34 @@ static int format_trailer_match_cb(const struct strbuf *key, void *ud)
return 0;
}
+static size_t parse_describe_args(const char *start, struct strvec *args)
+{
+ const char *options[] = { "match", "exclude" };
+ const char *arg = start;
+
+ for (;;) {
+ const char *matched = NULL;
+ const char *argval;
+ size_t arglen = 0;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(options); i++) {
+ if (match_placeholder_arg_value(arg, options[i], &arg,
+ &argval, &arglen)) {
+ matched = options[i];
+ break;
+ }
+ }
+ if (!matched)
+ break;
+
+ if (!arglen)
+ return 0;
+ strvec_pushf(args, "--%s=%.*s", matched, (int)arglen, argval);
+ }
+ return arg - start;
+}
+
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const char *placeholder,
void *context)
@@ -1215,20 +1243,31 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
return parse_padding_placeholder(placeholder, c);
}
- if (skip_prefix(placeholder, "(describe)", &arg)) {
+ if (skip_prefix(placeholder, "(describe", &arg)) {
struct child_process cmd = CHILD_PROCESS_INIT;
struct strbuf out = STRBUF_INIT;
struct strbuf err = STRBUF_INIT;
cmd.git_cmd = 1;
strvec_push(&cmd.args, "describe");
+
+ if (*arg == ':') {
+ arg++;
+ arg += parse_describe_args(arg, &cmd.args);
+ }
+
+ if (*arg != ')') {
+ child_process_clear(&cmd);
+ return 0;
+ }
+
strvec_push(&cmd.args, oid_to_hex(&commit->object.oid));
pipe_command(&cmd, NULL, 0, &out, 0, &err, 0);
strbuf_rtrim(&out);
strbuf_addbuf(sb, &out);
strbuf_release(&out);
strbuf_release(&err);
- return arg - placeholder;
+ return arg - placeholder + 1;
}
/* these depend on the commit */
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 5a44fa447d..7e36706212 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -972,4 +972,20 @@ test_expect_success '%(describe) vs git describe' '
test_must_be_empty err
'
+test_expect_success '%(describe:match=...) vs git describe --match ...' '
+ test_when_finished "git tag -d tag-match" &&
+ git tag -a -m tagged tag-match&&
+ git describe --match "*-match" >expect &&
+ git log -1 --format="%(describe:match=*-match)" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
+ test_when_finished "git tag -d tag-exclude" &&
+ git tag -a -m tagged tag-exclude &&
+ git describe --exclude "*-exclude" >expect &&
+ git log -1 --format="%(describe:exclude=*-exclude)" >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.30.1
next prev parent reply other threads:[~2021-02-14 10:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 0:32 gitattributes export-subst and software versioning Eli Schwartz
2021-02-08 19:46 ` René Scharfe
2021-02-08 22:41 ` Junio C Hamano
2021-02-09 0:19 ` Eli Schwartz
2021-02-09 20:42 ` Junio C Hamano
2021-02-14 10:04 ` René Scharfe
2021-02-14 10:04 ` René Scharfe
2021-02-14 10:04 ` [PATCH 1/2] pretty: add %(describe) René Scharfe
2021-02-14 10:10 ` René Scharfe. [this message]
2021-02-17 18:31 ` [PATCH 2/2] pretty: add merge and exclude options to %(describe) Jeff King
2021-02-28 11:22 ` René Scharfe.
2021-02-28 15:41 ` Ævar Arnfjörð Bjarmason
2021-03-02 16:00 ` René Scharfe.
2021-03-06 16:18 ` René Scharfe.
[not found] ` <xmqqy2f6rc8f.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` René Scharfe.
[not found] ` <xmqqsg5uletz.fsf@gitster.g>
2021-02-28 11:22 ` René Scharfe.
2021-02-16 5:04 ` [PATCH 1/2] pretty: add %(describe) Eli Schwartz
2021-02-16 13:00 ` Ævar Arnfjörð Bjarmason
2021-02-16 17:13 ` René Scharfe.
2021-02-16 18:44 ` Junio C Hamano
2021-02-17 0:47 ` Ævar Arnfjörð Bjarmason
2021-02-28 11:22 ` René Scharfe.
[not found] ` <xmqq35xesqzk.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` René Scharfe.
2021-02-17 0:58 ` Ævar Arnfjörð Bjarmason
2021-02-17 18:12 ` Junio C Hamano
2021-02-28 11:22 ` René Scharfe.
[not found] ` <xmqq7dmqsr72.fsf@gitster.c.googlers.com>
2021-03-02 16:00 ` René Scharfe.
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7bd37c4-ab13-0297-da46-716e26de10d6@web.de \
--to=l.s.r@web.de \
--cc=eschwartz@archlinux.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).