diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:29 -0700 |
| commit | fd0d7036e0da248f354e91fb8be8771fb20adfac (patch) | |
| tree | 2fe4ef0cec6a9724df9fa5e15860bb0867fc817c /commit.c | |
| parent | 6d09fc54f60cfd8d91f471c3bcdc935c8e301458 (diff) | |
| parent | ab628588f80e8dd889b700515c41548c1a356dcc (diff) | |
Merge branch 'ab/retire-advice-config'
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
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -25,6 +25,7 @@ static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); int save_commit_buffer = 1; +int no_graft_file_deprecated_advice; const char *commit_type = "commit"; @@ -190,7 +191,8 @@ static int read_graft_file(struct repository *r, const char *graft_file) struct strbuf buf = STRBUF_INIT; if (!fp) return -1; - if (advice_graft_file_deprecated) + if (!no_graft_file_deprecated_advice && + advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED)) advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" "\n" |