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

Merge branch 'hj/pretty-naked-decoration'

Browse Source 
The pretty-format specifier "%d", which expanded to " (tagname)"
for a tagged commit, gained a cousin "%D" that just gives the
"tagname" without frills.

* hj/pretty-naked-decoration:
  pretty: add %D format specifier
This commit is contained in:
Junio C Hamano
2014-09-29 12:36:08 -07:00
parent a9583afc1d 9271095cc5
commit b8e533f12a
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

@ -174,14 +174,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;
const struct name_decoration *decoration;
const char *color_commit =
diff_get_color(use_color, DIFF_COMMIT);
@ -191,7 +193,6 @@ void format_decorations(struct strbuf *sb,
decoration = get_name_decoration(&commit->object);
if (!decoration)
return;
prefix = " (";
while (decoration) {
strbuf_addstr(sb, color_commit);
strbuf_addstr(sb, prefix);
@ -200,11 +201,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);
}