1#include "cache.h"
2#include "config.h"
34
int advice_push_update_rejected = 1;
5int advice_push_non_ff_current = 1;
6int advice_push_non_ff_matching = 1;
7int advice_push_already_exists = 1;
8int advice_push_fetch_first = 1;
9int advice_push_needs_force = 1;
10int advice_status_hints = 1;
11int advice_status_u_option = 1;
12int advice_commit_before_merge = 1;
13int advice_resolve_conflict = 1;
14int advice_implicit_identity = 1;
15int advice_detached_head = 1;
16int advice_set_upstream_failure = 1;
17int advice_object_name_warning = 1;
18int advice_rm_hints = 1;
19int advice_add_embedded_repo = 1;
20int advice_ignored_hook = 1;
21int advice_waiting_for_editor = 1;
2223
static struct {
24const char *name;
25int *preference;
26} advice_config[] = {
27{ "pushupdaterejected", &advice_push_update_rejected },
28{ "pushnonffcurrent", &advice_push_non_ff_current },
29{ "pushnonffmatching", &advice_push_non_ff_matching },
30{ "pushalreadyexists", &advice_push_already_exists },
31{ "pushfetchfirst", &advice_push_fetch_first },
32{ "pushneedsforce", &advice_push_needs_force },
33{ "statushints", &advice_status_hints },
34{ "statusuoption", &advice_status_u_option },
35{ "commitbeforemerge", &advice_commit_before_merge },
36{ "resolveconflict", &advice_resolve_conflict },
37{ "implicitidentity", &advice_implicit_identity },
38{ "detachedhead", &advice_detached_head },
39{ "setupstreamfailure", &advice_set_upstream_failure },
40{ "objectnamewarning", &advice_object_name_warning },
41{ "rmhints", &advice_rm_hints },
42{ "addembeddedrepo", &advice_add_embedded_repo },
43{ "ignoredhook", &advice_ignored_hook },
44{ "waitingforeditor", &advice_waiting_for_editor },
4546
/* make this an alias for backward compatibility */
47{ "pushnonfastforward", &advice_push_update_rejected }
48};
4950
void advise(const char *advice, ...)
51{
52struct strbuf buf = STRBUF_INIT;
53va_list params;
54const char *cp, *np;
5556
va_start(params, advice);
57strbuf_vaddf(&buf, advice, params);
58va_end(params);
5960
for (cp = buf.buf; *cp; cp = np) {
61np = strchrnul(cp, '\n');
62fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
63if (*np)
64np++;
65}
66strbuf_release(&buf);
67}
6869
int git_default_advice_config(const char *var, const char *value)
70{
71const char *k;
72int i;
7374
if (!skip_prefix(var, "advice.", &k))
75return 0;
7677
for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
78if (strcmp(k, advice_config[i].name))
79continue;
80*advice_config[i].preference = git_config_bool(var, value);
81return 0;
82}
8384
return 0;
85}
8687
int error_resolve_conflict(const char *me)
88{
89if (!strcmp(me, "cherry-pick"))
90error(_("Cherry-picking is not possible because you have unmerged files."));
91else if (!strcmp(me, "commit"))
92error(_("Committing is not possible because you have unmerged files."));
93else if (!strcmp(me, "merge"))
94error(_("Merging is not possible because you have unmerged files."));
95else if (!strcmp(me, "pull"))
96error(_("Pulling is not possible because you have unmerged files."));
97else if (!strcmp(me, "revert"))
98error(_("Reverting is not possible because you have unmerged files."));
99else
100error(_("It is not possible to %s because you have unmerged files."),
101me);
102103
if (advice_resolve_conflict)
104/*
105* Message used both when 'git commit' fails and when
106* other commands doing a merge do.
107*/
108advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
109"as appropriate to mark resolution and make a commit."));
110return -1;
111}
112113
void NORETURN die_resolve_conflict(const char *me)
114{
115error_resolve_conflict(me);
116die(_("Exiting because of an unresolved conflict."));
117}
118119
void NORETURN die_conclude_merge(void)
120{
121error(_("You have not concluded your merge (MERGE_HEAD exists)."));
122if (advice_resolve_conflict)
123advise(_("Please, commit your changes before merging."));
124die(_("Exiting because of unfinished merge."));
125}
126127
void detach_advice(const char *new_name)
128{
129const char *fmt =
130_("Note: checking out '%s'.\n\n"
131"You are in 'detached HEAD' state. You can look around, make experimental\n"
132"changes and commit them, and you can discard any commits you make in this\n"
133"state without impacting any branches by performing another checkout.\n\n"
134"If you want to create a new branch to retain commits you create, you may\n"
135"do so (now or later) by using -b with the checkout command again. Example:\n\n"
136" git checkout -b <new-branch-name>\n\n");
137138
fprintf(stderr, fmt, new_name);
139}