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 /builtin/merge.c | |
| parent | Merge branch 'mk/clone-recurse-submodules' (diff) | |
| parent | advice: move advice.graftFileDeprecated squashing to commit.[ch] (diff) | |
| download | tgif-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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 42a1989d4a..d2c52b6e97 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1368,14 +1368,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * There is no unmerged entry, don't advise 'git * add/rm <file>', just 'git commit'. */ - if (advice_resolve_conflict) + if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) die(_("You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge.")); else die(_("You have not concluded your merge (MERGE_HEAD exists).")); } if (ref_exists("CHERRY_PICK_HEAD")) { - if (advice_resolve_conflict) + if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge.")); else |