]> granicus.if.org Git - git/commitdiff
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)
"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

1  2 
log-tree.c
revision.c
t/t4202-log.sh

diff --cc log-tree.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge