diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 20:46:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 20:46:29 +0200 |
| commit | fd0d7036e0da248f354e91fb8be8771fb20adfac (patch) | |
| tree | 2fe4ef0cec6a9724df9fa5e15860bb0867fc817c /advice.h | |
| parent | Merge branch 'mk/clone-recurse-submodules' (diff) | |
| parent | advice: move advice.graftFileDeprecated squashing to commit.[ch] (diff) | |
| download | git-fd0d7036e0da248f354e91fb8be8771fb20adfac.tar.xz git-fd0d7036e0da248f354e91fb8be8771fb20adfac.zip | |
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 'advice.h')
| -rw-r--r-- | advice.h | 34 |
1 files changed, 2 insertions, 32 deletions
@@ -5,38 +5,6 @@ struct string_list; -extern int advice_fetch_show_forced_updates; -extern int advice_push_update_rejected; -extern int advice_push_non_ff_current; -extern int advice_push_non_ff_matching; -extern int advice_push_already_exists; -extern int advice_push_fetch_first; -extern int advice_push_needs_force; -extern int advice_push_unqualified_ref_name; -extern int advice_push_ref_needs_update; -extern int advice_status_hints; -extern int advice_status_u_option; -extern int advice_status_ahead_behind_warning; -extern int advice_commit_before_merge; -extern int advice_reset_quiet_warning; -extern int advice_resolve_conflict; -extern int advice_sequencer_in_use; -extern int advice_implicit_identity; -extern int advice_detached_head; -extern int advice_set_upstream_failure; -extern int advice_object_name_warning; -extern int advice_amworkdir; -extern int advice_rm_hints; -extern int advice_add_embedded_repo; -extern int advice_ignored_hook; -extern int advice_waiting_for_editor; -extern int advice_graft_file_deprecated; -extern int advice_checkout_ambiguous_remote_branch_name; -extern int advice_submodule_alternate_error_strategy_die; -extern int advice_add_ignored_file; -extern int advice_add_empty_pathspec; -extern int advice_skipped_cherry_picks; - /* * To add a new advice, you need to: * Define a new advice_type. @@ -46,6 +14,8 @@ extern int advice_skipped_cherry_picks; */ enum advice_type { ADVICE_ADD_EMBEDDED_REPO, + ADVICE_ADD_EMPTY_PATHSPEC, + ADVICE_ADD_IGNORED_FILE, ADVICE_AM_WORK_DIR, ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, ADVICE_COMMIT_BEFORE_MERGE, |