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

pretty: add %D format specifier

Browse Source 
Add a new format specifier, '%D' that is identical in behaviour to '%d',
except that it does not include the ' (' prefix or ')' suffix provided
by '%d'.

Signed-off-by: Harry Jeffery <harry@exec64.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Harry Jeffery
2014-09-18 21:53:53 +01:00
committed by Junio C Hamano
parent 96db324a73
commit 9271095cc5
5 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
log-tree.c
View File

@ -179,14 +179,16 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
}
/*
* The caller makes sure there is no funny color before
* calling. format_decorations makes sure the same after return.
* The caller makes sure there is no funny color before calling.
* format_decorations_extended makes sure the same after return.
*/
void format_decorations(struct strbuf *sb,
void format_decorations_extended(struct strbuf *sb,
const struct commit *commit,
int use_color)
int use_color,
const char *prefix,
const char *separator,
const char *suffix)
{
const char *prefix;
struct name_decoration *decoration;
const char *color_commit =
diff_get_color(use_color, DIFF_COMMIT);
@ -196,7 +198,6 @@ void format_decorations(struct strbuf *sb,
decoration = lookup_decoration(&name_decoration, &commit->object);
if (!decoration)
return;
prefix = " (";
while (decoration) {
strbuf_addstr(sb, color_commit);
strbuf_addstr(sb, prefix);
@ -205,11 +206,11 @@ void format_decorations(struct strbuf *sb,
strbuf_addstr(sb, "tag: ");
strbuf_addstr(sb, decoration->name);
strbuf_addstr(sb, color_reset);
prefix = ", ";
prefix = separator;
decoration = decoration->next;
}
strbuf_addstr(sb, color_commit);
strbuf_addch(sb, ')');
strbuf_addstr(sb, suffix);
strbuf_addstr(sb, color_reset);
}