summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-07 02:32:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 02:32:54 (GMT)
commited6822896bf4d28c12614e18e3fdcc5dc27ff8e5 (patch)
tree4e43a17a745392858901709f84e18c237c725514 /log-tree.c
parentad8f0368b45bf1ab0f1339033d0a62cee94b1ae2 (diff)
parent0cc7380d8846c30ce0d5d6310b2cb5994f269133 (diff)
downloadgit-ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5.zip
git-ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5.tar.gz
git-ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5.tar.bz2
Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
"git log --decorate-refs-exclude=<pattern>" was incorrectly overruled when the "--simplify-by-decoration" option is used, which has been corrected. * rs/simplify-by-deco-with-deco-refs-exclude: log-tree: call load_ref_decorations() in get_name_decoration() log: test --decorate-refs-exclude with --simplify-by-decoration
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 109c212..923a299 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);
}