undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log: create log.initialDecorationSet=all

Browse Source 
The previous change introduced the --clear-decorations option for users
who do not want their decorations limited to a narrow set of ref
namespaces.

Add a config option that is equivalent to specifying --clear-decorations
by default.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2022-08-05 17:58:41 +00:00 committed by Junio C Hamano
parent 748706d713
commit 3e103ed23f
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config/log.txt
View File

@ -18,6 +18,11 @@ log.decorate::
names are shown. This is the same as the `--decorate` option names are shown. This is the same as the `--decorate` option
of the `git log`. of the `git log`.
log.initialDecorationSet::
By default, `git log` only shows decorations for certain known ref
namespaces. If 'all' is specified, then show all refs as
decorations.
log.excludeDecoration:: log.excludeDecoration::
Exclude the specified patterns from the log decorations. This is Exclude the specified patterns from the log decorations. This is
similar to the `--decorate-refs-exclude` command-line option, but similar to the `--decorate-refs-exclude` command-line option, but

4
Documentation/git-log.txt
View File

@ -59,7 +59,9 @@ used as decoration if they match `HEAD`, `refs/heads/`, `refs/remotes/`,
--clear-decorations:: --clear-decorations::
When specified, this option clears all previous `--decorate-refs` When specified, this option clears all previous `--decorate-refs`
or `--decorate-refs-exclude` options and relaxes the default or `--decorate-refs-exclude` options and relaxes the default
decoration filter to include all references. decoration filter to include all references. This option is
assumed if the config value `log.initialDecorationSet` is set to
`all`.
--source:: --source::
Print out the ref name given on the command line by which each Print out the ref name given on the command line by which each

12
builtin/log.c
View File

@ -179,6 +179,7 @@ static void cmd_log_init_defaults(struct rev_info *rev)
static void set_default_decoration_filter(struct decoration_filter *decoration_filter) static void set_default_decoration_filter(struct decoration_filter *decoration_filter)
{ {
int i; int i;
char *value = NULL;
struct string_list *include = decoration_filter->include_ref_pattern; struct string_list *include = decoration_filter->include_ref_pattern;
const struct string_list *config_exclude = const struct string_list *config_exclude =
git_config_get_value_multi("log.excludeDecoration"); git_config_get_value_multi("log.excludeDecoration");
@ -190,6 +191,17 @@ static void set_default_decoration_filter(struct decoration_filter *decoration_f
item->string); item->string);
} }
/*
* By default, decorate_all is disabled. Enable it if
* log.initialDecorationSet=all. Don't ever disable it by config,
* since the command-line takes precedent.
*/
if (use_default_decoration_filter &&
!git_config_get_string("log.initialdecorationset", &value) &&
!strcmp("all", value))
use_default_decoration_filter = 0;
free(value);
if (!use_default_decoration_filter || if (!use_default_decoration_filter ||
decoration_filter->exclude_ref_pattern->nr || decoration_filter->exclude_ref_pattern->nr ||
decoration_filter->include_ref_pattern->nr || decoration_filter->include_ref_pattern->nr ||

3
t/t4202-log.sh
View File

@ -1090,6 +1090,9 @@ test_expect_success '--clear-decorations overrides defaults' '
EOF EOF
git log --decorate=full --pretty="tformat:%f%d" \ git log --decorate=full --pretty="tformat:%f%d" \
--clear-decorations >actual && --clear-decorations >actual &&
test_cmp expect.all actual &&
git -c log.initialDecorationSet=all log \
--decorate=full --pretty="tformat:%f%d" >actual &&
test_cmp expect.all actual test_cmp expect.all actual
' '