1 #include "git-compat-util.h"
7 #include "string-list.h"
9 static int advice_use_color
= -1;
10 static char advice_colors
[][COLOR_MAXLEN
] = {
12 GIT_COLOR_YELLOW
, /* HINT */
16 ADVICE_COLOR_RESET
= 0,
17 ADVICE_COLOR_HINT
= 1,
20 static int parse_advise_color_slot(const char *slot
)
22 if (!strcasecmp(slot
, "reset"))
23 return ADVICE_COLOR_RESET
;
24 if (!strcasecmp(slot
, "hint"))
25 return ADVICE_COLOR_HINT
;
29 static const char *advise_get_color(enum color_advice ix
)
31 if (want_color_stderr(advice_use_color
))
32 return advice_colors
[ix
];
37 ADVICE_LEVEL_NONE
= 0,
38 ADVICE_LEVEL_DISABLED
,
44 enum advice_level level
;
45 } advice_setting
[] = {
46 [ADVICE_ADD_EMBEDDED_REPO
] = { "addEmbeddedRepo" },
47 [ADVICE_ADD_EMPTY_PATHSPEC
] = { "addEmptyPathspec" },
48 [ADVICE_ADD_IGNORED_FILE
] = { "addIgnoredFile" },
49 [ADVICE_AMBIGUOUS_FETCH_REFSPEC
] = { "ambiguousFetchRefspec" },
50 [ADVICE_AM_WORK_DIR
] = { "amWorkDir" },
51 [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME
] = { "checkoutAmbiguousRemoteBranchName" },
52 [ADVICE_COMMIT_BEFORE_MERGE
] = { "commitBeforeMerge" },
53 [ADVICE_DETACHED_HEAD
] = { "detachedHead" },
54 [ADVICE_DIVERGING
] = { "diverging" },
55 [ADVICE_FETCH_SHOW_FORCED_UPDATES
] = { "fetchShowForcedUpdates" },
56 [ADVICE_FORCE_DELETE_BRANCH
] = { "forceDeleteBranch" },
57 [ADVICE_GRAFT_FILE_DEPRECATED
] = { "graftFileDeprecated" },
58 [ADVICE_IGNORED_HOOK
] = { "ignoredHook" },
59 [ADVICE_IMPLICIT_IDENTITY
] = { "implicitIdentity" },
60 [ADVICE_NESTED_TAG
] = { "nestedTag" },
61 [ADVICE_OBJECT_NAME_WARNING
] = { "objectNameWarning" },
62 [ADVICE_PUSH_ALREADY_EXISTS
] = { "pushAlreadyExists" },
63 [ADVICE_PUSH_FETCH_FIRST
] = { "pushFetchFirst" },
64 [ADVICE_PUSH_NEEDS_FORCE
] = { "pushNeedsForce" },
65 [ADVICE_PUSH_NON_FF_CURRENT
] = { "pushNonFFCurrent" },
66 [ADVICE_PUSH_NON_FF_MATCHING
] = { "pushNonFFMatching" },
67 [ADVICE_PUSH_REF_NEEDS_UPDATE
] = { "pushRefNeedsUpdate" },
68 [ADVICE_PUSH_UNQUALIFIED_REF_NAME
] = { "pushUnqualifiedRefName" },
69 [ADVICE_PUSH_UPDATE_REJECTED
] = { "pushUpdateRejected" },
70 [ADVICE_PUSH_UPDATE_REJECTED_ALIAS
] = { "pushNonFastForward" }, /* backwards compatibility */
71 [ADVICE_RESET_NO_REFRESH_WARNING
] = { "resetNoRefresh" },
72 [ADVICE_RESOLVE_CONFLICT
] = { "resolveConflict" },
73 [ADVICE_RM_HINTS
] = { "rmHints" },
74 [ADVICE_SEQUENCER_IN_USE
] = { "sequencerInUse" },
75 [ADVICE_SET_UPSTREAM_FAILURE
] = { "setUpstreamFailure" },
76 [ADVICE_SKIPPED_CHERRY_PICKS
] = { "skippedCherryPicks" },
77 [ADVICE_STATUS_AHEAD_BEHIND_WARNING
] = { "statusAheadBehindWarning" },
78 [ADVICE_STATUS_HINTS
] = { "statusHints" },
79 [ADVICE_STATUS_U_OPTION
] = { "statusUoption" },
80 [ADVICE_SUBMODULES_NOT_UPDATED
] = { "submodulesNotUpdated" },
81 [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE
] = { "submoduleAlternateErrorStrategyDie" },
82 [ADVICE_SUGGEST_DETACHING_HEAD
] = { "suggestDetachingHead" },
83 [ADVICE_UPDATE_SPARSE_PATH
] = { "updateSparsePath" },
84 [ADVICE_WAITING_FOR_EDITOR
] = { "waitingForEditor" },
85 [ADVICE_WORKTREE_ADD_ORPHAN
] = { "worktreeAddOrphan" },
88 static const char turn_off_instructions
[] =
90 "Disable this message with \"git config advice.%s false\"");
92 static void vadvise(const char *advice
, int display_instructions
,
93 const char *key
, va_list params
)
95 struct strbuf buf
= STRBUF_INIT
;
98 strbuf_vaddf(&buf
, advice
, params
);
100 if (display_instructions
)
101 strbuf_addf(&buf
, turn_off_instructions
, key
);
103 for (cp
= buf
.buf
; *cp
; cp
= np
) {
104 np
= strchrnul(cp
, '\n');
105 fprintf(stderr
, _("%shint: %.*s%s\n"),
106 advise_get_color(ADVICE_COLOR_HINT
),
108 advise_get_color(ADVICE_COLOR_RESET
));
112 strbuf_release(&buf
);
115 void advise(const char *advice
, ...)
118 va_start(params
, advice
);
119 vadvise(advice
, 0, "", params
);
123 int advice_enabled(enum advice_type type
)
125 int enabled
= advice_setting
[type
].level
!= ADVICE_LEVEL_DISABLED
;
127 if (type
== ADVICE_PUSH_UPDATE_REJECTED
)
129 advice_enabled(ADVICE_PUSH_UPDATE_REJECTED_ALIAS
);
134 void advise_if_enabled(enum advice_type type
, const char *advice
, ...)
138 if (!advice_enabled(type
))
141 va_start(params
, advice
);
142 vadvise(advice
, !advice_setting
[type
].level
, advice_setting
[type
].key
,
147 int git_default_advice_config(const char *var
, const char *value
)
149 const char *k
, *slot_name
;
152 if (!strcmp(var
, "color.advice")) {
153 advice_use_color
= git_config_colorbool(var
, value
);
157 if (skip_prefix(var
, "color.advice.", &slot_name
)) {
158 int slot
= parse_advise_color_slot(slot_name
);
162 return config_error_nonbool(var
);
163 return color_parse(value
, advice_colors
[slot
]);
166 if (!skip_prefix(var
, "advice.", &k
))
169 for (i
= 0; i
< ARRAY_SIZE(advice_setting
); i
++) {
170 if (strcasecmp(k
, advice_setting
[i
].key
))
172 advice_setting
[i
].level
= git_config_bool(var
, value
)
173 ? ADVICE_LEVEL_ENABLED
174 : ADVICE_LEVEL_DISABLED
;
181 void list_config_advices(struct string_list
*list
, const char *prefix
)
185 for (i
= 0; i
< ARRAY_SIZE(advice_setting
); i
++)
186 list_config_item(list
, prefix
, advice_setting
[i
].key
);
189 int error_resolve_conflict(const char *me
)
191 if (!strcmp(me
, "cherry-pick"))
192 error(_("Cherry-picking is not possible because you have unmerged files."));
193 else if (!strcmp(me
, "commit"))
194 error(_("Committing is not possible because you have unmerged files."));
195 else if (!strcmp(me
, "merge"))
196 error(_("Merging is not possible because you have unmerged files."));
197 else if (!strcmp(me
, "pull"))
198 error(_("Pulling is not possible because you have unmerged files."));
199 else if (!strcmp(me
, "revert"))
200 error(_("Reverting is not possible because you have unmerged files."));
201 else if (!strcmp(me
, "rebase"))
202 error(_("Rebasing is not possible because you have unmerged files."));
204 BUG("Unhandled conflict reason '%s'", me
);
206 if (advice_enabled(ADVICE_RESOLVE_CONFLICT
))
208 * Message used both when 'git commit' fails and when
209 * other commands doing a merge do.
211 advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
212 "as appropriate to mark resolution and make a commit."));
216 void NORETURN
die_resolve_conflict(const char *me
)
218 error_resolve_conflict(me
);
219 die(_("Exiting because of an unresolved conflict."));
222 void NORETURN
die_conclude_merge(void)
224 error(_("You have not concluded your merge (MERGE_HEAD exists)."));
225 if (advice_enabled(ADVICE_RESOLVE_CONFLICT
))
226 advise(_("Please, commit your changes before merging."));
227 die(_("Exiting because of unfinished merge."));
230 void NORETURN
die_ff_impossible(void)
232 advise_if_enabled(ADVICE_DIVERGING
,
233 _("Diverging branches can't be fast-forwarded, you need to either:\n"
235 "\tgit merge --no-ff\n"
240 die(_("Not possible to fast-forward, aborting."));
243 void advise_on_updating_sparse_paths(struct string_list
*pathspec_list
)
245 struct string_list_item
*item
;
247 if (!pathspec_list
->nr
)
250 fprintf(stderr
, _("The following paths and/or pathspecs matched paths that exist\n"
251 "outside of your sparse-checkout definition, so will not be\n"
252 "updated in the index:\n"));
253 for_each_string_list_item(item
, pathspec_list
)
254 fprintf(stderr
, "%s\n", item
->string
);
256 advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH
,
257 _("If you intend to update such entries, try one of the following:\n"
258 "* Use the --sparse option.\n"
259 "* Disable or modify the sparsity rules."));
262 void detach_advice(const char *new_name
)
265 _("Note: switching to '%s'.\n"
267 "You are in 'detached HEAD' state. You can look around, make experimental\n"
268 "changes and commit them, and you can discard any commits you make in this\n"
269 "state without impacting any branches by switching back to a branch.\n"
271 "If you want to create a new branch to retain commits you create, you may\n"
272 "do so (now or later) by using -c with the switch command. Example:\n"
274 " git switch -c <new-branch-name>\n"
276 "Or undo this operation with:\n"
280 "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
282 fprintf(stderr
, fmt
, new_name
);
285 void advise_on_moving_dirty_path(struct string_list
*pathspec_list
)
287 struct string_list_item
*item
;
289 if (!pathspec_list
->nr
)
292 fprintf(stderr
, _("The following paths have been moved outside the\n"
293 "sparse-checkout definition but are not sparse due to local\n"
294 "modifications.\n"));
295 for_each_string_list_item(item
, pathspec_list
)
296 fprintf(stderr
, "%s\n", item
->string
);
298 advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH
,
299 _("To correct the sparsity of these paths, do the following:\n"
300 "* Use \"git add --sparse <paths>\" to update the index\n"
301 "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"));