From 0cc7380d8846c30ce0d5d6310b2cb5994f269133 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sun, 8 Sep 2019 19:58:51 +0200 Subject: log-tree: call load_ref_decorations() in get_name_decoration() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- revision.c | 1 - 1 file changed, 1 deletion(-) (limited to 'revision.c') 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; -- cgit 1.2.3-korg