Skip to content
Permalink
Newer
Older
100644 119 lines (104 sloc) 3.45 KB
1
#include "cache.h"
2
3
int advice_push_update_rejected = 1;
4
int advice_push_non_ff_current = 1;
5
int advice_push_non_ff_matching = 1;
6
int advice_push_already_exists = 1;
7
int advice_push_fetch_first = 1;
8
int advice_push_needs_force = 1;
9
int advice_status_hints = 1;
10
int advice_status_u_option = 1;
11
int advice_commit_before_merge = 1;
12
int advice_resolve_conflict = 1;
13
int advice_implicit_identity = 1;
January 29, 2010 22:03
14
int advice_detached_head = 1;
15
int advice_set_upstream_failure = 1;
16
int advice_object_name_warning = 1;
17
int advice_rm_hints = 1;
18
19
static struct {
20
const char *name;
21
int *preference;
22
} advice_config[] = {
23
{ "pushupdaterejected", &advice_push_update_rejected },
24
{ "pushnonffcurrent", &advice_push_non_ff_current },
25
{ "pushnonffmatching", &advice_push_non_ff_matching },
26
{ "pushalreadyexists", &advice_push_already_exists },
27
{ "pushfetchfirst", &advice_push_fetch_first },
28
{ "pushneedsforce", &advice_push_needs_force },
29
{ "statushints", &advice_status_hints },
30
{ "statusuoption", &advice_status_u_option },
31
{ "commitbeforemerge", &advice_commit_before_merge },
32
{ "resolveconflict", &advice_resolve_conflict },
33
{ "implicitidentity", &advice_implicit_identity },
January 29, 2010 22:03
34
{ "detachedhead", &advice_detached_head },
35
{ "setupstreamfailure", &advice_set_upstream_failure },
36
{ "objectnamewarning", &advice_object_name_warning },
37
{ "rmhints", &advice_rm_hints },
38
39
/* make this an alias for backward compatibility */
40
{ "pushnonfastforward", &advice_push_update_rejected }
43
void advise(const char *advice, ...)
44
{
December 22, 2011 11:21
45
struct strbuf buf = STRBUF_INIT;
46
va_list params;
December 22, 2011 11:21
47
const char *cp, *np;
48
49
va_start(params, advice);
50
strbuf_vaddf(&buf, advice, params);
51
va_end(params);
December 22, 2011 11:21
52
53
for (cp = buf.buf; *cp; cp = np) {
54
np = strchrnul(cp, '\n');
55
fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
56
if (*np)
57
np++;
58
}
59
strbuf_release(&buf);
60
}
61
62
int git_default_advice_config(const char *var, const char *value)
63
{
64
const char *k;
65
int i;
66
67
if (!skip_prefix(var, "advice.", &k))
68
return 0;
69
70
for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
71
if (strcmp(k, advice_config[i].name))
72
continue;
73
*advice_config[i].preference = git_config_bool(var, value);
74
return 0;
75
}
76
77
return 0;
78
}
79
80
int error_resolve_conflict(const char *me)
81
{
82
error("%s is not possible because you have unmerged files.", me);
December 22, 2011 11:21
83
if (advice_resolve_conflict)
84
/*
85
* Message used both when 'git commit' fails and when
86
* other commands doing a merge do.
87
*/
88
advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
89
"as appropriate to mark resolution and make a commit."));
90
return -1;
91
}
92
93
void NORETURN die_resolve_conflict(const char *me)
94
{
95
error_resolve_conflict(me);
96
die("Exiting because of an unresolved conflict.");
97
}
98
99
void NORETURN die_conclude_merge(void)
100
{
101
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
102
if (advice_resolve_conflict)
103
advise(_("Please, commit your changes before merging."));
104
die(_("Exiting because of unfinished merge."));
105
}
106
107
void detach_advice(const char *new_name)
108
{
109
const char fmt[] =
110
"Note: checking out '%s'.\n\n"
111
"You are in 'detached HEAD' state. You can look around, make experimental\n"
112
"changes and commit them, and you can discard any commits you make in this\n"
113
"state without impacting any branches by performing another checkout.\n\n"
114
"If you want to create a new branch to retain commits you create, you may\n"
115
"do so (now or later) by using -b with the checkout command again. Example:\n\n"
January 13, 2015 00:44
116
" git checkout -b <new-branch-name>\n\n";
117
118
fprintf(stderr, fmt, new_name);
119
}