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 /editor.c | |
| parent | 6d09fc54f60cfd8d91f471c3bcdc935c8e301458 (diff) | |
| parent | ab628588f80e8dd889b700515c41548c1a356dcc (diff) | |
| download | git-fd0d7036e0da248f354e91fb8be8771fb20adfac.tar.xz | |
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 'editor.c')
| -rw-r--r-- | editor.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -58,7 +58,7 @@ static int launch_specified_editor(const char *editor, const char *path, const char *args[] = { editor, NULL, NULL }; struct child_process p = CHILD_PROCESS_INIT; int ret, sig; - int print_waiting_for_editor = advice_waiting_for_editor && isatty(2); + int print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2); if (print_waiting_for_editor) { /* |