diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:54 +0900 |
| commit | ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5 (patch) | |
| tree | 4e43a17a745392858901709f84e18c237c725514 /log-tree.c | |
| parent | Merge branch 'jk/partial-clone-sparse-blob' (diff) | |
| parent | log-tree: call load_ref_decorations() in get_name_decoration() (diff) | |
| download | tgif-ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5.tar.xz | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 109c212224..923a299e70 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); } |