summaryrefslogtreecommitdiff
path: root/revision.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 /revision.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 'revision.c')
-rw-r--r--revision.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index a2406c4..442a705 100644
--- a/revision.c
+++ b/revision.c
@@ -2061,7 +2061,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;