4 #include "git-compat-util.h"
6 extern int advice_fetch_show_forced_updates;
7 extern int advice_push_update_rejected;
8 extern int advice_push_non_ff_current;
9 extern int advice_push_non_ff_matching;
10 extern int advice_push_already_exists;
11 extern int advice_push_fetch_first;
12 extern int advice_push_needs_force;
13 extern int advice_push_unqualified_ref_name;
14 extern int advice_push_ref_needs_update;
15 extern int advice_status_hints;
16 extern int advice_status_u_option;
17 extern int advice_status_ahead_behind_warning;
18 extern int advice_commit_before_merge;
19 extern int advice_reset_quiet_warning;
20 extern int advice_resolve_conflict;
21 extern int advice_sequencer_in_use;
22 extern int advice_implicit_identity;
23 extern int advice_detached_head;
24 extern int advice_set_upstream_failure;
25 extern int advice_object_name_warning;
26 extern int advice_amworkdir;
27 extern int advice_rm_hints;
28 extern int advice_add_embedded_repo;
29 extern int advice_ignored_hook;
30 extern int advice_waiting_for_editor;
31 extern int advice_graft_file_deprecated;
32 extern int advice_checkout_ambiguous_remote_branch_name;
33 extern int advice_submodule_alternate_error_strategy_die;
34 extern int advice_add_ignored_file;
35 extern int advice_add_empty_pathspec;
38 * To add a new advice, you need to:
39 * Define a new advice_type.
40 * Add a new entry to advice_setting array.
41 * Add the new config variable to Documentation/config/advice.txt.
42 * Call advise_if_enabled to print your advice.
45 ADVICE_ADD_EMBEDDED_REPO,
47 ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
48 ADVICE_COMMIT_BEFORE_MERGE,
50 ADVICE_FETCH_SHOW_FORCED_UPDATES,
51 ADVICE_GRAFT_FILE_DEPRECATED,
53 ADVICE_IMPLICIT_IDENTITY,
55 ADVICE_OBJECT_NAME_WARNING,
56 ADVICE_PUSH_ALREADY_EXISTS,
57 ADVICE_PUSH_FETCH_FIRST,
58 ADVICE_PUSH_NEEDS_FORCE,
59 ADVICE_PUSH_NON_FF_CURRENT,
60 ADVICE_PUSH_NON_FF_MATCHING,
61 ADVICE_PUSH_UNQUALIFIED_REF_NAME,
62 ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
63 ADVICE_PUSH_UPDATE_REJECTED,
64 ADVICE_PUSH_REF_NEEDS_UPDATE,
65 ADVICE_RESET_QUIET_WARNING,
66 ADVICE_RESOLVE_CONFLICT,
68 ADVICE_SEQUENCER_IN_USE,
69 ADVICE_SET_UPSTREAM_FAILURE,
70 ADVICE_STATUS_AHEAD_BEHIND_WARNING,
72 ADVICE_STATUS_U_OPTION,
73 ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
74 ADVICE_WAITING_FOR_EDITOR,
77 int git_default_advice_config(const char *var, const char *value);
78 __attribute__((format (printf, 1, 2)))
79 void advise(const char *advice, ...);
82 * Checks if advice type is enabled (can be printed to the user).
83 * Should be called before advise().
85 int advice_enabled(enum advice_type type);
88 * Checks the visibility of the advice before printing.
90 void advise_if_enabled(enum advice_type type, const char *advice, ...);
92 int error_resolve_conflict(const char *me);
93 void NORETURN die_resolve_conflict(const char *me);
94 void NORETURN die_conclude_merge(void);
95 void detach_advice(const char *new_name);