I reviewed Ben Boeckel's advice() patches in https://lore.kernel.org/git/RFC-cover-v3-0.4-0000000000-20210806T191231Z-avarab@xxxxxxxxx and submitted that review as an RFC. Since there's been no feedback there from the author here's a non-RFC version. The only change from v3 is the commit message typos/grammar fixes pointed out by Eric Sunshine. Thanks! Ben Boeckel (2): advice: add enum variants for missing advice variables advice: remove read uses of most global `advice_` variables Ævar Arnfjörð Bjarmason (2): advice: remove use of global advice_add_embedded_repo advice: move advice.graftFileDeprecated squashing to commit.[ch] advice.c | 83 ++----------------------------------- advice.h | 33 +-------------- branch.c | 2 +- builtin/add.c | 11 ++--- builtin/am.c | 2 +- builtin/checkout.c | 6 +-- builtin/clone.c | 2 +- builtin/commit.c | 4 +- builtin/fetch.c | 2 +- builtin/merge.c | 4 +- builtin/push.c | 12 +++--- builtin/replace.c | 2 +- builtin/reset.c | 2 +- builtin/rm.c | 2 +- builtin/submodule--helper.c | 2 +- commit.c | 4 +- commit.h | 1 + editor.c | 2 +- notes-merge.c | 2 +- object-name.c | 2 +- remote.c | 12 +++--- run-command.c | 2 +- sequencer.c | 8 ++-- unpack-trees.c | 18 ++++---- wt-status.c | 6 +-- 25 files changed, 63 insertions(+), 163 deletions(-) Range-diff against v3: 1: 5f934bb083b = 1: 4e977e9d5a1 advice: add enum variants for missing advice variables 2: eefcafcf8f5 ! 2: 3869bda3b39 advice: remove read uses of most global `advice_` variables @@ Commit message This patch ports all but two uses which read the status of the global `advice_` variables over to the new `advice_enabled` API. We'll deal with advice_add_embedded_repo and advice_graft_file_deprecated - seperately. + separately. Signed-off-by: Ben Boeckel <mathstuf@xxxxxxxxx> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> 3: 02613d0f307 ! 3: e1018212e40 advice: remove use of global advice_add_embedded_repo @@ Commit message advice: remove use of global advice_add_embedded_repo The external use of this variable was added in 532139940c9 (add: warn - when adding an embedded repository, 2017-06-14), for the use-case it's - more straightforward to track whether we've adviced in + when adding an embedded repository, 2017-06-14). For the use-case it's + more straightforward to track whether we've shown advice in check_embedded_repo() than setting the global variable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> 4: fe6f6328f9c = 4: 7f79fb282e5 advice: move advice.graftFileDeprecated squashing to commit.[ch] -- 2.33.0.663.gfcc3c7013a8