]> git.ipfire.org Git - thirdparty/git.git/blame - advice.h
Merge branch 'jt/t5500-unflake'
[thirdparty/git.git] / advice.h
CommitLineData
75194438
JK
1#ifndef ADVICE_H
2#define ADVICE_H
3
d38a30df
MM
4#include "git-compat-util.h"
5
377444b4 6extern int advice_fetch_show_forced_updates;
1184564e 7extern int advice_push_update_rejected;
f25950f3 8extern int advice_push_non_ff_current;
f25950f3 9extern int advice_push_non_ff_matching;
b4505682 10extern int advice_push_already_exists;
75e5c0dc
JH
11extern int advice_push_fetch_first;
12extern int advice_push_needs_force;
dd8dd300 13extern int advice_push_unqualified_ref_name;
edf563fb 14extern int advice_status_hints;
6a38ef2c 15extern int advice_status_u_option;
0a53561a 16extern int advice_status_ahead_behind_warning;
4c371f91 17extern int advice_commit_before_merge;
649bf3a4 18extern int advice_reset_quiet_warning;
d38a30df 19extern int advice_resolve_conflict;
6a1f9046 20extern int advice_sequencer_in_use;
b706fcfe 21extern int advice_implicit_identity;
13be3e31 22extern int advice_detached_head;
caa2036b 23extern int advice_set_upstream_failure;
798c35fc 24extern int advice_object_name_warning;
431bb23a 25extern int advice_amworkdir;
7e309446 26extern int advice_rm_hints;
53213994 27extern int advice_add_embedded_repo;
f805a00a 28extern int advice_ignored_hook;
abfb04d0 29extern int advice_waiting_for_editor;
f9f99b3f 30extern int advice_graft_file_deprecated;
ad8d5104 31extern int advice_checkout_ambiguous_remote_branch_name;
4f3e57ef 32extern int advice_submodule_alternate_error_strategy_die;
887a0fd5
HW
33extern int advice_add_ignored_file;
34extern int advice_add_empty_pathspec;
75194438 35
b3b18d16
HW
36/*
37 * To add a new advice, you need to:
38 * Define a new advice_type.
39 * Add a new entry to advice_setting array.
40 * Add the new config variable to Documentation/config/advice.txt.
41 * Call advise_if_enabled to print your advice.
42 */
43 enum advice_type {
44 ADVICE_ADD_EMBEDDED_REPO,
45 ADVICE_AM_WORK_DIR,
46 ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
47 ADVICE_COMMIT_BEFORE_MERGE,
48 ADVICE_DETACHED_HEAD,
49 ADVICE_FETCH_SHOW_FORCED_UPDATES,
50 ADVICE_GRAFT_FILE_DEPRECATED,
51 ADVICE_IGNORED_HOOK,
52 ADVICE_IMPLICIT_IDENTITY,
53 ADVICE_NESTED_TAG,
54 ADVICE_OBJECT_NAME_WARNING,
55 ADVICE_PUSH_ALREADY_EXISTS,
56 ADVICE_PUSH_FETCH_FIRST,
57 ADVICE_PUSH_NEEDS_FORCE,
58 ADVICE_PUSH_NON_FF_CURRENT,
59 ADVICE_PUSH_NON_FF_MATCHING,
60 ADVICE_PUSH_UNQUALIFIED_REF_NAME,
61 ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
62 ADVICE_PUSH_UPDATE_REJECTED,
63 ADVICE_RESET_QUIET_WARNING,
64 ADVICE_RESOLVE_CONFLICT,
65 ADVICE_RM_HINTS,
66 ADVICE_SEQUENCER_IN_USE,
67 ADVICE_SET_UPSTREAM_FAILURE,
68 ADVICE_STATUS_AHEAD_BEHIND_WARNING,
69 ADVICE_STATUS_HINTS,
70 ADVICE_STATUS_U_OPTION,
71 ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
72 ADVICE_WAITING_FOR_EDITOR,
73};
74
75194438 75int git_default_advice_config(const char *var, const char *value);
4621085b 76__attribute__((format (printf, 1, 2)))
38ef61cf 77void advise(const char *advice, ...);
b3b18d16
HW
78
79/**
80 * Checks if advice type is enabled (can be printed to the user).
81 * Should be called before advise().
82 */
83int advice_enabled(enum advice_type type);
84
85/**
86 * Checks the visibility of the advice before printing.
87 */
88void advise_if_enabled(enum advice_type type, const char *advice, ...);
89
38ef61cf 90int error_resolve_conflict(const char *me);
55454427 91void NORETURN die_resolve_conflict(const char *me);
4a4cf9e8 92void NORETURN die_conclude_merge(void);
2857093b 93void detach_advice(const char *new_name);
d38a30df 94
75194438 95#endif /* ADVICE_H */