From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Oct 2019 02:32:54 +0000 (+0900)
Subject: Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
X-Git-Tag: v2.24.0-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5;p=thirdparty%2Fgit.git

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
---

ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5