]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/retire-advice-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:29 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:29 +0000 (11:46 -0700)
Code clean up to migrate callers from older advice_config[] based
API to newer advice_if_enabled() and advice_enabled() API.

* ab/retire-advice-config:
  advice: move advice.graftFileDeprecated squashing to commit.[ch]
  advice: remove use of global advice_add_embedded_repo
  advice: remove read uses of most global `advice_` variables
  advice: add enum variants for missing advice variables

1  2 
advice.c
advice.h
builtin/add.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/fetch.c
builtin/merge.c
run-command.c
sequencer.c
unpack-trees.c

diff --cc advice.c
Simple merge
diff --cc advice.h
Simple merge
diff --cc builtin/add.c
Simple merge
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc run-command.c
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc unpack-trees.c
Simple merge