advice: remove read uses of most global `advice_` variables

[thirdparty/git.git] / advice.c

diff --git a/advice.c b/advice.c
index 6da51be63c13d06cf60c8a5f340fe43d06a177b7..b18833bc807a50a05176e70c701bfadb068e25fe 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -4,36 +4,8 @@
 #include "help.h"
 #include "string-list.h"
 
-int advice_fetch_show_forced_updates = 1;
-int advice_push_update_rejected = 1;
-int advice_push_non_ff_current = 1;
-int advice_push_non_ff_matching = 1;
-int advice_push_already_exists = 1;
-int advice_push_fetch_first = 1;
-int advice_push_needs_force = 1;
-int advice_push_unqualified_ref_name = 1;
-int advice_push_ref_needs_update = 1;
-int advice_status_hints = 1;
-int advice_status_u_option = 1;
-int advice_status_ahead_behind_warning = 1;
-int advice_commit_before_merge = 1;
-int advice_reset_quiet_warning = 1;
-int advice_resolve_conflict = 1;
-int advice_sequencer_in_use = 1;
-int advice_implicit_identity = 1;
-int advice_detached_head = 1;
-int advice_set_upstream_failure = 1;
-int advice_object_name_warning = 1;
-int advice_amworkdir = 1;
-int advice_rm_hints = 1;
 int advice_add_embedded_repo = 1;
-int advice_ignored_hook = 1;
-int advice_waiting_for_editor = 1;
 int advice_graft_file_deprecated = 1;
-int advice_checkout_ambiguous_remote_branch_name = 1;
-int advice_submodule_alternate_error_strategy_die = 1;
-int advice_add_ignored_file = 1;
-int advice_add_empty_pathspec = 1;
 
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
@@ -66,39 +38,8 @@ static struct {
        const char *name;
        int *preference;
 } advice_config[] = {
-       { "fetchShowForcedUpdates", &advice_fetch_show_forced_updates },
-       { "pushUpdateRejected", &advice_push_update_rejected },
-       { "pushNonFFCurrent", &advice_push_non_ff_current },
-       { "pushNonFFMatching", &advice_push_non_ff_matching },
-       { "pushAlreadyExists", &advice_push_already_exists },
-       { "pushFetchFirst", &advice_push_fetch_first },
-       { "pushNeedsForce", &advice_push_needs_force },
-       { "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
-       { "pushRefNeedsUpdate", &advice_push_ref_needs_update },
-       { "statusHints", &advice_status_hints },
-       { "statusUoption", &advice_status_u_option },
-       { "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
-       { "commitBeforeMerge", &advice_commit_before_merge },
-       { "resetQuiet", &advice_reset_quiet_warning },
-       { "resolveConflict", &advice_resolve_conflict },
-       { "sequencerInUse", &advice_sequencer_in_use },
-       { "implicitIdentity", &advice_implicit_identity },
-       { "detachedHead", &advice_detached_head },
-       { "setUpstreamFailure", &advice_set_upstream_failure },
-       { "objectNameWarning", &advice_object_name_warning },
-       { "amWorkDir", &advice_amworkdir },
-       { "rmHints", &advice_rm_hints },
        { "addEmbeddedRepo", &advice_add_embedded_repo },
-       { "ignoredHook", &advice_ignored_hook },
-       { "waitingForEditor", &advice_waiting_for_editor },
        { "graftFileDeprecated", &advice_graft_file_deprecated },
-       { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
-       { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
-       { "addIgnoredFile", &advice_add_ignored_file },
-       { "addEmptyPathspec", &advice_add_empty_pathspec },
-
-       /* make this an alias for backward compatibility */
-       { "pushNonFastForward", &advice_push_update_rejected }
 };
 
 static struct {
@@ -264,7 +205,7 @@ int error_resolve_conflict(const char *me)
                error(_("It is not possible to %s because you have unmerged files."),
                        me);
 
-       if (advice_resolve_conflict)
+       if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
                /*
                 * Message used both when 'git commit' fails and when
                 * other commands doing a merge do.
@@ -283,7 +224,7 @@ void NORETURN die_resolve_conflict(const char *me)
 void NORETURN die_conclude_merge(void)
 {
        error(_("You have not concluded your merge (MERGE_HEAD exists)."));
-       if (advice_resolve_conflict)
+       if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
                advise(_("Please, commit your changes before merging."));
        die(_("Exiting because of unfinished merge."));
 }