); SAEximRunCond expanded to false
Signed-off-by: Anders Waldenborg <anders@xxxxxxx>
---
Documentation/pretty-formats.txt | 4 +++-
pretty.c | 5 ++++-
t/t4205-log-pretty-formats.sh | 6 ++++++
trailer.c | 7 +++++--
trailer.h | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 84bbc7439a..1714fa447d 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -256,7 +256,9 @@ endif::git-rev-list[]
** 'key=<K>': only show trailers with specified key. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
- shown. This option automatically enables the `only` option so that
+ shown. If `trailer.<token>.key` configuration option is set 'token'
+ can be used as an alias for showing trailers with the value in
+ key. This option automatically enables the `only` option so that
non-trailer lines in the trailer block are hidden. If that is not
desired it can be disabled with `only=false`. E.g.,
`%(trailers:key=Reviewed-by)` shows trailer lines with key
diff --git a/pretty.c b/pretty.c
index 7a7708a0ea..3c374abffe 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1135,7 +1135,7 @@ static int match_placeholder_bool_arg(const char *to_parse, const char *candidat
return 1;
}
-static int format_trailer_match_cb(const struct strbuf *key, void *ud)
+static int format_trailer_match_cb(const struct strbuf *key, const char *alias, void *ud)
{
const struct string_list *list = ud;
const struct string_list_item *item;
@@ -1144,6 +1144,9 @@ static int format_trailer_match_cb(const struct strbuf *key, void *ud)
if (key->len == (uintptr_t)item->util &&
!strncasecmp(item->string, key->buf, key->len))
return 1;
+ if (alias && strlen(alias) == (uintptr_t)item->util &&
+ !strncasecmp(item->string, alias, (uintptr_t)item->util))
+ return 1;
}
return 0;
}
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 204c149d5a..757575d3f6 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -676,6 +676,12 @@ test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
test_cmp expect actual
'
+test_expect_success 'pretty format %(trailers:key=foo) alias in config' '
+ git -c trailer.ab.key=Acked-by log --no-walk --pretty="format:%(trailers:key=ab)" >actual &&
+ echo "Acked-by: A U Thor <author@xxxxxxxxxxx>" >expect &&
+ test_cmp expect actual
+'
+
test_expect_success '%(trailers:key=nonexistent) becomes empty' '
git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
echo "xx" >expect &&
diff --git a/trailer.c b/trailer.c
index ca7a823af6..8c0687a529 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1148,8 +1148,11 @@ static void format_trailer_info(struct strbuf *out,
struct strbuf tok = STRBUF_INIT;
struct strbuf val = STRBUF_INIT;
- parse_trailer(&tok, &val, NULL, trailer, separator_pos);
- if (!opts->filter || opts->filter(&tok, opts->filter_data)) {
+ const struct conf_info *conf;
+
+ parse_trailer(&tok, &val, &conf, trailer, separator_pos);
+ if (!opts->filter ||
+ opts->filter(&tok, conf ? conf->name : NULL, opts->filter_data)) {
if (opts->unfold)
unfold_value(&val);
diff --git a/trailer.h b/trailer.h
index cd93e7ddea..b362b0d44d 100644
--- a/trailer.h
+++ b/trailer.h
@@ -73,7 +73,7 @@ struct process_trailer_options {
int no_divider;
int value_only;
const struct strbuf *separator;
- int (*filter)(const struct strbuf *, void *);
+ int (*filter)(const struct strbuf *, const char *alias, void *);
void *filter_data;
};
--
2.25.1
