mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty: add pointer and tag options to %(decorate)

Browse Source 
Add pointer and tag options to %(decorate) format, to allow to override
the " -> " string used to show where HEAD points and the "tag: " string
used to mark tags.

Document in pretty-formats.txt and test in t4205-log-pretty-formats.sh.

Signed-off-by: Andy Koppe <andy.koppe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andy Koppe
2023-08-20 19:50:08 +01:00
committed by Junio C Hamano
parent a58dd835e9
commit f1f8a25856
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
log-tree.c
View File

@ -317,6 +317,8 @@ void format_decorations(struct strbuf *sb,
const char *prefix = " (";
const char *suffix = ")";
const char *separator = ", ";
const char *pointer = " -> ";
const char *tag = "tag: ";
decoration = get_name_decoration(&commit->object);
if (!decoration)
@ -329,6 +331,10 @@ void format_decorations(struct strbuf *sb,
suffix = opts->suffix;
if (opts->separator)
separator = opts->separator;
if (opts->pointer)
pointer = opts->pointer;
if (opts->tag)
tag = opts->tag;
}
color_commit = diff_get_color(use_color, DIFF_COMMIT);
@ -351,9 +357,9 @@ void format_decorations(struct strbuf *sb,
strbuf_addstr(sb, color_reset);
}
if (decoration->type == DECORATION_REF_TAG) {
if (*tag && decoration->type == DECORATION_REF_TAG) {
strbuf_addstr(sb, color);
strbuf_addstr(sb, "tag: ");
strbuf_addstr(sb, tag);
strbuf_addstr(sb, color_reset);
}
@ -364,7 +370,7 @@ void format_decorations(struct strbuf *sb,
if (current_and_HEAD &&
decoration->type == DECORATION_REF_HEAD) {
strbuf_addstr(sb, color);
strbuf_addstr(sb, " -> ");
strbuf_addstr(sb, pointer);
strbuf_addstr(sb, color_reset);
strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
show_name(sb, current_and_HEAD);