diff options
| author |  Ben Boeckel <mathstuf@gmail.com> | 2021-08-23 12:44:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-25 12:07:52 -0700 |
| commit | ed9bff0817d5a7500b50a39c1c35b44aa3e72578 (patch) | |
| tree | 2fbf27448d1085ad518e03a6c2a6c7902d271a28 /builtin/am.c | |
| parent | advice: add enum variants for missing advice variables (diff) | |
| download | tgif-ed9bff0817d5a7500b50a39c1c35b44aa3e72578.tar.xz | |
advice: remove read uses of most global `advice_` variables
In c4a09cc9ccb (Merge branch 'hw/advise-ng', 2020-03-25), a new API for
accessing advice variables was introduced and deprecated `advice_config`
in favor of a new array, `advice_setting`.
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
separately.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 0c2ad96b70..ff7dd33fcd 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1820,7 +1820,7 @@ static void am_run(struct am_state *state, int resume) printf_ln(_("Patch failed at %s %.*s"), msgnum(state), linelen(state->msg), state->msg); - if (advice_amworkdir) + if (advice_enabled(ADVICE_AM_WORK_DIR)) advise(_("Use 'git am --show-current-patch=diff' to see the failed patch")); die_user_resolve(state); |