diff options
| author | René Scharfe <l.s.r@web.de> | 2019-09-08 19:58:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 11:16:40 -0700 |
| commit | 0cc7380d8846c30ce0d5d6310b2cb5994f269133 (patch) | |
| tree | 8c654e8aa8000725ff6f6ccd5a4e373485a5eb4c /pretty.c | |
| parent | b4ecbcf6a256e533a3e0231095758527999e7fe0 (diff) | |
| download | git-0cc7380d8846c30ce0d5d6310b2cb5994f269133.tar.gz | |
log-tree: call load_ref_decorations() in get_name_decoration()
Load a default set of ref name decorations at the first lookup. This
frees direct and indirect callers from doing so. They can still do it
if they want to use a filter or are interested in full decorations
instead of the default short ones -- the first load_ref_decorations()
call wins.
This means that the load in builtin/log.c::cmd_log_init_finish() is
respected even if --simplify-by-decoration is given, as the previously
dominating earlier load in handle_revision_opt() is gone. So a filter
given with --decorate-refs-exclude is used for simplification in that
case, as expected.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
| -rw-r--r-- | pretty.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1239,11 +1239,9 @@ 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(NULL, DECORATE_SHORT_REFS); format_decorations(sb, commit, c->auto_color); return 1; case 'D': - load_ref_decorations(NULL, DECORATE_SHORT_REFS); format_decorations_extended(sb, commit, c->auto_color, "", ", ", ""); return 1; case 'S': /* tag/branch like --source */ |