Coverage Report

Created: 2026-11-12 06:03

next uncovered line (L), next uncovered region (R), next uncovered branch (B)
/src/git/advice.c
Line
Count
Source
1
#include "git-compat-util.h"
2
#include "advice.h"
3
#include "config.h"
4
#include "color.h"
5
#include "environment.h"
6
#include "gettext.h"
7
#include "help.h"
8
#include "string-list.h"
9
10
static enum git_colorbool advice_use_color = GIT_COLOR_UNKNOWN;
11
static char advice_colors[][COLOR_MAXLEN] = {
12
  GIT_COLOR_RESET,
13
  GIT_COLOR_YELLOW, /* HINT */
14
};
15
16
enum color_advice {
17
  ADVICE_COLOR_RESET = 0,
18
  ADVICE_COLOR_HINT = 1,
19
};
20
21
static int parse_advise_color_slot(const char *slot)
22
0
{
23
0
  if (!strcasecmp(slot, "reset"))
24
0
    return ADVICE_COLOR_RESET;
25
0
  if (!strcasecmp(slot, "hint"))
26
0
    return ADVICE_COLOR_HINT;
27
0
  return -1;
28
0
}
29
30
static const char *advise_get_color(enum color_advice ix)
31
0
{
32
0
  if (want_color_stderr(advice_use_color))
33
0
    return advice_colors[ix];
34
0
  return "";
35
0
}
36
37
enum advice_level {
38
  ADVICE_LEVEL_NONE = 0,
39
  ADVICE_LEVEL_DISABLED,
40
  ADVICE_LEVEL_ENABLED,
41
};
42
43
static struct {
44
  const char *key;
45
  enum advice_level level;
46
} advice_setting[] = {
47
  [ADVICE_ADD_EMBEDDED_REPO]      = { "addEmbeddedRepo" },
48
  [ADVICE_ADD_EMPTY_PATHSPEC]     = { "addEmptyPathspec" },
49
  [ADVICE_ADD_IGNORED_FILE]     = { "addIgnoredFile" },
50
  [ADVICE_AMBIGUOUS_FETCH_REFSPEC]    = { "ambiguousFetchRefspec" },
51
  [ADVICE_AM_WORK_DIR]        = { "amWorkDir" },
52
  [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME]  = { "checkoutAmbiguousRemoteBranchName" },
53
  [ADVICE_COMMIT_BEFORE_MERGE]      = { "commitBeforeMerge" },
54
  [ADVICE_DEFAULT_BRANCH_NAME]      = { "defaultBranchName" },
55
  [ADVICE_DETACHED_HEAD]        = { "detachedHead" },
56
  [ADVICE_DIVERGING]        = { "diverging" },
57
  [ADVICE_FETCH_SET_HEAD_WARN]      = { "fetchRemoteHEADWarn" },
58
  [ADVICE_FETCH_SHOW_FORCED_UPDATES]    = { "fetchShowForcedUpdates" },
59
  [ADVICE_FORCE_DELETE_BRANCH]      = { "forceDeleteBranch" },
60
  [ADVICE_GRAFT_FILE_DEPRECATED]      = { "graftFileDeprecated" },
61
  [ADVICE_HISTORY_UPDATE_REFS]      = { "historyUpdateRefs" },
62
  [ADVICE_IGNORED_HOOK]       = { "ignoredHook" },
63
  [ADVICE_IMPLICIT_IDENTITY]      = { "implicitIdentity" },
64
  [ADVICE_MERGE_CONFLICT]       = { "mergeConflict" },
65
  [ADVICE_NESTED_TAG]       = { "nestedTag" },
66
  [ADVICE_OBJECT_NAME_WARNING]      = { "objectNameWarning" },
67
  [ADVICE_PUSH_ALREADY_EXISTS]      = { "pushAlreadyExists" },
68
  [ADVICE_PUSH_FETCH_FIRST]     = { "pushFetchFirst" },
69
  [ADVICE_PUSH_NEEDS_FORCE]     = { "pushNeedsForce" },
70
  [ADVICE_PUSH_NON_FF_CURRENT]      = { "pushNonFFCurrent" },
71
  [ADVICE_PUSH_NON_FF_MATCHING]     = { "pushNonFFMatching" },
72
  [ADVICE_PUSH_REF_NEEDS_UPDATE]      = { "pushRefNeedsUpdate" },
73
  [ADVICE_PUSH_REPO_LOOKS_LIKE_REF]   = { "pushRepoLooksLikeRef" },
74
  [ADVICE_PUSH_UNQUALIFIED_REF_NAME]    = { "pushUnqualifiedRefName" },
75
  [ADVICE_PUSH_UPDATE_REJECTED]     = { "pushUpdateRejected" },
76
  [ADVICE_PUSH_UPDATE_REJECTED_ALIAS]   = { "pushNonFastForward" }, /* backwards compatibility */
77
  [ADVICE_REBASE_TODO_ERROR]      = { "rebaseTodoError" },
78
  [ADVICE_REF_SYNTAX]       = { "refSyntax" },
79
  [ADVICE_RESET_NO_REFRESH_WARNING]   = { "resetNoRefresh" },
80
  [ADVICE_RESOLVE_CONFLICT]     = { "resolveConflict" },
81
  [ADVICE_RM_HINTS]       = { "rmHints" },
82
  [ADVICE_SEQUENCER_IN_USE]     = { "sequencerInUse" },
83
  [ADVICE_SET_UPSTREAM_FAILURE]     = { "setUpstreamFailure" },
84
  [ADVICE_SKIPPED_CHERRY_PICKS]     = { "skippedCherryPicks" },
85
  [ADVICE_SPARSE_INDEX_EXPANDED]      = { "sparseIndexExpanded" },
86
  [ADVICE_STATUS_AHEAD_BEHIND_WARNING]    = { "statusAheadBehindWarning" },
87
  [ADVICE_STATUS_HINTS]       = { "statusHints" },
88
  [ADVICE_STATUS_U_OPTION]      = { "statusUoption" },
89
  [ADVICE_SUBMODULES_NOT_UPDATED]     = { "submodulesNotUpdated" },
90
  [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie" },
91
  [ADVICE_SUBMODULE_MERGE_CONFLICT]               = { "submoduleMergeConflict" },
92
  [ADVICE_SUGGEST_DETACHING_HEAD]     = { "suggestDetachingHead" },
93
  [ADVICE_UPDATE_SPARSE_PATH]     = { "updateSparsePath" },
94
  [ADVICE_WAITING_FOR_EDITOR]     = { "waitingForEditor" },
95
  [ADVICE_WORKTREE_ADD_ORPHAN]      = { "worktreeAddOrphan" },
96
};
97
98
static const char turn_off_instructions[] =
99
N_("\n"
100
   "Disable this message with \"git config set --global advice.%s false\"");
101
102
static void vadvise(const char *advice, int display_instructions,
103
        const char *key, va_list params)
104
0
{
105
0
  struct strbuf buf = STRBUF_INIT;
106
0
  const char *cp, *np;
107
108
0
  strbuf_vaddf(&buf, advice, params);
109
110
0
  if (display_instructions)
111
0
    strbuf_addf(&buf, turn_off_instructions, key);
112
113
0
  for (cp = buf.buf; *cp; cp = np) {
114
0
    np = strchrnul(cp, '\n');
115
0
    fprintf(stderr, _("%shint:%s%.*s%s\n"),
116
0
      advise_get_color(ADVICE_COLOR_HINT),
117
0
      (np == cp) ? "" : " ",
118
0
      (int)(np - cp), cp,
119
0
      advise_get_color(ADVICE_COLOR_RESET));
120
0
    if (*np)
121
0
      np++;
122
0
  }
123
0
  strbuf_release(&buf);
124
0
}
125
126
void advise(const char *advice, ...)
127
0
{
128
0
  va_list params;
129
0
  va_start(params, advice);
130
0
  vadvise(advice, 0, "", params);
131
0
  va_end(params);
132
0
}
133
134
int advice_enabled(enum advice_type type)
135
0
{
136
0
  int enabled = advice_setting[type].level != ADVICE_LEVEL_DISABLED;
137
0
  static int globally_enabled = -1;
138
139
0
  if (globally_enabled < 0)
140
0
    globally_enabled = git_env_bool(GIT_ADVICE_ENVIRONMENT, 1);
141
0
  if (!globally_enabled)
142
0
    return 0;
143
144
0
  if (type == ADVICE_PUSH_UPDATE_REJECTED)
145
0
    return enabled &&
146
0
           advice_enabled(ADVICE_PUSH_UPDATE_REJECTED_ALIAS);
147
148
0
  return enabled;
149
0
}
150
151
void advise_if_enabled(enum advice_type type, const char *advice, ...)
152
0
{
153
0
  va_list params;
154
155
0
  if (!advice_enabled(type))
156
0
    return;
157
158
0
  va_start(params, advice);
159
0
  vadvise(advice, !advice_setting[type].level, advice_setting[type].key,
160
0
    params);
161
0
  va_end(params);
162
0
}
163
164
int git_default_advice_config(const char *var, const char *value)
165
0
{
166
0
  const char *k, *slot_name;
167
168
0
  if (!strcmp(var, "color.advice")) {
169
0
    advice_use_color = git_config_colorbool(var, value);
170
0
    return 0;
171
0
  }
172
173
0
  if (skip_prefix(var, "color.advice.", &slot_name)) {
174
0
    int slot = parse_advise_color_slot(slot_name);
175
0
    if (slot < 0)
176
0
      return 0;
177
0
    if (!value)
178
0
      return config_error_nonbool(var);
179
0
    return color_parse(value, advice_colors[slot]);
180
0
  }
181
182
0
  if (!skip_prefix(var, "advice.", &k))
183
0
    return 0;
184
185
0
  for (size_t i = 0; i < ARRAY_SIZE(advice_setting); i++) {
186
0
    if (strcasecmp(k, advice_setting[i].key))
187
0
      continue;
188
0
    advice_setting[i].level = git_config_bool(var, value)
189
0
            ? ADVICE_LEVEL_ENABLED
190
0
            : ADVICE_LEVEL_DISABLED;
191
0
    return 0;
192
0
  }
193
194
0
  return 0;
195
0
}
196
197
void list_config_advices(struct string_list *list, const char *prefix)
198
0
{
199
0
  for (size_t i = 0; i < ARRAY_SIZE(advice_setting); i++)
200
0
    list_config_item(list, prefix, advice_setting[i].key);
201
0
}
202
203
int error_resolve_conflict(const char *me)
204
0
{
205
0
  if (!strcmp(me, "cherry-pick"))
206
0
    error(_("Cherry-picking is not possible because you have unmerged files."));
207
0
  else if (!strcmp(me, "commit"))
208
0
    error(_("Committing is not possible because you have unmerged files."));
209
0
  else if (!strcmp(me, "merge"))
210
0
    error(_("Merging is not possible because you have unmerged files."));
211
0
  else if (!strcmp(me, "pull"))
212
0
    error(_("Pulling is not possible because you have unmerged files."));
213
0
  else if (!strcmp(me, "revert"))
214
0
    error(_("Reverting is not possible because you have unmerged files."));
215
0
  else if (!strcmp(me, "rebase"))
216
0
    error(_("Rebasing is not possible because you have unmerged files."));
217
0
  else
218
0
    BUG("Unhandled conflict reason '%s'", me);
219
220
0
  if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
221
    /*
222
     * Message used both when 'git commit' fails and when
223
     * other commands doing a merge do.
224
     */
225
0
    advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
226
0
       "as appropriate to mark resolution and make a commit."));
227
0
  return -1;
228
0
}
229
230
void NORETURN die_resolve_conflict(const char *me)
231
0
{
232
0
  error_resolve_conflict(me);
233
0
  die(_("Exiting because of an unresolved conflict."));
234
0
}
235
236
void NORETURN die_conclude_merge(void)
237
0
{
238
0
  error(_("You have not concluded your merge (MERGE_HEAD exists)."));
239
0
  if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
240
0
    advise(_("Please, commit your changes before merging."));
241
0
  die(_("Exiting because of unfinished merge."));
242
0
}
243
244
void NORETURN die_ff_impossible(void)
245
0
{
246
0
  advise_if_enabled(ADVICE_DIVERGING,
247
0
    _("Diverging branches can't be fast-forwarded, you need to either:\n"
248
0
    "\n"
249
0
    "\tgit merge --no-ff\n"
250
0
    "\n"
251
0
    "or:\n"
252
0
    "\n"
253
0
    "\tgit rebase\n"));
254
0
  die(_("Not possible to fast-forward, aborting."));
255
0
}
256
257
void advise_on_updating_sparse_paths(struct string_list *pathspec_list)
258
0
{
259
0
  struct string_list_item *item;
260
261
0
  if (!pathspec_list->nr)
262
0
    return;
263
264
0
  fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n"
265
0
        "outside of your sparse-checkout definition, so will not be\n"
266
0
        "updated in the index:\n"));
267
0
  for_each_string_list_item(item, pathspec_list)
268
0
    fprintf(stderr, "%s\n", item->string);
269
270
0
  advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH,
271
0
        _("If you intend to update such entries, try one of the following:\n"
272
0
          "* Use the --sparse option.\n"
273
0
          "* Disable or modify the sparsity rules."));
274
0
}
275
276
void detach_advice(const char *new_name)
277
0
{
278
0
  const char *fmt =
279
0
  _("Note: switching to '%s'.\n"
280
0
  "\n"
281
0
  "You are in 'detached HEAD' state. You can look around, make experimental\n"
282
0
  "changes and commit them, and you can discard any commits you make in this\n"
283
0
  "state without impacting any branches by switching back to a branch.\n"
284
0
  "\n"
285
0
  "If you want to create a new branch to retain commits you create, you may\n"
286
0
  "do so (now or later) by using -c with the switch command. Example:\n"
287
0
  "\n"
288
0
  "  git switch -c <new-branch-name>\n"
289
0
  "\n"
290
0
  "Or undo this operation with:\n"
291
0
  "\n"
292
0
  "  git switch -\n"
293
0
  "\n"
294
0
  "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
295
296
0
  fprintf(stderr, fmt, new_name);
297
0
}
298
299
void advise_on_moving_dirty_path(struct string_list *pathspec_list)
300
0
{
301
0
  struct string_list_item *item;
302
303
0
  if (!pathspec_list->nr)
304
0
    return;
305
306
0
  fprintf(stderr, _("The following paths have been moved outside the\n"
307
0
        "sparse-checkout definition but are not sparse due to local\n"
308
0
        "modifications.\n"));
309
0
  for_each_string_list_item(item, pathspec_list)
310
0
    fprintf(stderr, "%s\n", item->string);
311
312
0
  advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH,
313
0
        _("To correct the sparsity of these paths, do the following:\n"
314
0
          "* Use \"git add --sparse <paths>\" to update the index\n"
315
0
          "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"));
316
0
}