]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/decorate-filter-tweak'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:10 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2022 21:55:11 +0000 (14:55 -0700)
The namespaces used by "log --decorate" from "refs/" hierarchy by
default has been tightened.

* ds/decorate-filter-tweak:
  fetch: use ref_namespaces during prefetch
  maintenance: stop writing log.excludeDecoration
  log: create log.initialDecorationSet=all
  log: add --clear-decorations option
  log: add default decoration filter
  log-tree: use ref_namespaces instead of if/else-if
  refs: use ref_namespaces for replace refs base
  refs: add array of ref namespaces
  t4207: test coloring of grafted decorations
  t4207: modernize test
  refs: allow "HEAD" as decoration filter

1  2 
builtin/fetch.c
builtin/gc.c
builtin/log.c
cache.h
t/t4202-log.sh

diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/gc.c
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc t/t4202-log.sh
Simple merge