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 | |
| parent | log: test --decorate-refs-exclude with --simplify-by-decoration (diff) | |
| download | tgif-0cc7380d8846c30ce0d5d6310b2cb5994f269133.tar.xz | |
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>
| -rw-r--r-- | log-tree.c | 1 | ||||
| -rw-r--r-- | pretty.c | 2 | ||||
| -rw-r--r-- | revision.c | 1 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c index 1e56df62a7..2d5710e707 100644 --- a/log-tree.c +++ b/log-tree.c @@ -77,6 +77,7 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj const struct name_decoration *get_name_decoration(const struct object *obj) { + load_ref_decorations(NULL, DECORATE_SHORT_REFS); return lookup_decoration(&name_decoration, obj); } @@ -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 */ diff --git a/revision.c b/revision.c index 07412297f0..1df3061e95 100644 --- a/revision.c +++ b/revision.c @@ -2063,7 +2063,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->simplify_by_decoration = 1; revs->limited = 1; revs->prune = 1; - load_ref_decorations(NULL, DECORATE_SHORT_REFS); } else if (!strcmp(arg, "--date-order")) { revs->sort_order = REV_SORT_BY_COMMIT_DATE; revs->topo_order = 1; diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 01c95d1375..bb66d1d93c 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -837,7 +837,7 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' ' test_cmp expect.decorate actual ' -test_expect_failure 'decorate-refs-exclude and simplify-by-decoration' ' +test_expect_success 'decorate-refs-exclude and simplify-by-decoration' ' cat >expect.decorate <<-\EOF && Merge-tag-reach (HEAD -> master) reach (tag: reach, reach) |