]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:54 +0000 (11:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:54 +0000 (11:32 +0900)
commited6822896bf4d28c12614e18e3fdcc5dc27ff8e5
tree4e43a17a745392858901709f84e18c237c725514
parentad8f0368b45bf1ab0f1339033d0a62cee94b1ae2
parent0cc7380d8846c30ce0d5d6310b2cb5994f269133
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
log-tree.c
revision.c
t/t4202-log.sh