diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:09 -0700 |
| commit | b8e533f12acec63242c5405286fbbcfa66eecfdd (patch) | |
| tree | 32ededef297ace728b1c59a5425b8b383eae75a8 /log-tree.h | |
| parent | a9583afc1df1df10d60d2b81fd4b0976bc67ca4e (diff) | |
| parent | 9271095cc5571e306d709ebf8eb7f0a388254d9d (diff) | |
| download | git-b8e533f12acec63242c5405286fbbcfa66eecfdd.tar.gz | |
Merge branch 'hj/pretty-naked-decoration'
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
Diffstat (limited to 'log-tree.h')
| -rw-r--r-- | log-tree.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/log-tree.h b/log-tree.h index d6ecd4dc46..b26160c4d6 100644 --- a/log-tree.h +++ b/log-tree.h @@ -13,7 +13,13 @@ int log_tree_diff_flush(struct rev_info *); int log_tree_commit(struct rev_info *, struct commit *); int log_tree_opt_parse(struct rev_info *, const char **, int); void show_log(struct rev_info *opt); -void format_decorations(struct strbuf *sb, const struct commit *commit, int use_color); +void format_decorations_extended(struct strbuf *sb, const struct commit *commit, + int use_color, + const char *prefix, + const char *separator, + const char *suffix); +#define format_decorations(strbuf, commit, color) \ + format_decorations_extended((strbuf), (commit), (color), " (", ", ", ")") void show_decorations(struct rev_info *opt, struct commit *commit); void log_write_email_headers(struct rev_info *opt, struct commit *commit, const char **subject_p, |