summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-13 13:28:54 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-13 13:28:54 -0800
commit6c3daa23461333c508c41faa532c6fb749cd0db0 (patch)
tree0d480e7fae2e4d975e317b22f99d668bac436fbe /pretty.c
parent721cc4314cb593e799213ad5f926a1e9fc5779b0 (diff)
parent65516f586b69307f977cd67cc45513a296cabc25 (diff)
downloadgit-6c3daa23461333c508c41faa532c6fb749cd0db0.tar.gz
Merge branch 'ra/decorate-limit-refs'
The tagnames "git log --decorate" uses to annotate the commits can now be limited to subset of available refs with the two additional options, --decorate-refs[-exclude]=<pattern>. * ra/decorate-limit-refs: log: add option to choose which refs to decorate
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pretty.c b/pretty.c
index 2f6b0ae6c1..f7ce490230 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1186,11 +1186,11 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
strbuf_addstr(sb, get_revision_mark(NULL, commit));
return 1;
case 'd':
- load_ref_decorations(DECORATE_SHORT_REFS);
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations(sb, commit, c->auto_color);
return 1;
case 'D':
- load_ref_decorations(DECORATE_SHORT_REFS);
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations_extended(sb, commit, c->auto_color, "", ", ", "");
return 1;
case 'g': /* reflog info */