Elijah Newren | fc7bd51 | 2023-02-24 00:09:34 +0000 | [diff] [blame] | 1 | #include "git-compat-util.h" |
| 2 | #include "advice.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 4 | #include "color.h" |
Elijah Newren | fc7bd51 | 2023-02-24 00:09:34 +0000 | [diff] [blame] | 5 | #include "gettext.h" |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 6 | #include "help.h" |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 7 | #include "string-list.h" |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 8 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 9 | static int advice_use_color = -1; |
| 10 | static char advice_colors[][COLOR_MAXLEN] = { |
| 11 | GIT_COLOR_RESET, |
| 12 | GIT_COLOR_YELLOW, /* HINT */ |
| 13 | }; |
| 14 | |
| 15 | enum color_advice { |
| 16 | ADVICE_COLOR_RESET = 0, |
| 17 | ADVICE_COLOR_HINT = 1, |
| 18 | }; |
| 19 | |
| 20 | static int parse_advise_color_slot(const char *slot) |
| 21 | { |
| 22 | if (!strcasecmp(slot, "reset")) |
| 23 | return ADVICE_COLOR_RESET; |
| 24 | if (!strcasecmp(slot, "hint")) |
| 25 | return ADVICE_COLOR_HINT; |
| 26 | return -1; |
| 27 | } |
| 28 | |
| 29 | static const char *advise_get_color(enum color_advice ix) |
| 30 | { |
| 31 | if (want_color_stderr(advice_use_color)) |
| 32 | return advice_colors[ix]; |
| 33 | return ""; |
| 34 | } |
| 35 | |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 36 | enum advice_level { |
| 37 | ADVICE_LEVEL_NONE = 0, |
| 38 | ADVICE_LEVEL_DISABLED, |
| 39 | ADVICE_LEVEL_ENABLED, |
| 40 | }; |
| 41 | |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 42 | static struct { |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 43 | const char *key; |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 44 | enum advice_level level; |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 45 | } advice_setting[] = { |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 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" }, |
Philippe Blain | ec03009 | 2024-03-16 21:16:29 +0000 | [diff] [blame] | 60 | [ADVICE_MERGE_CONFLICT] = { "mergeConflict" }, |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 61 | [ADVICE_NESTED_TAG] = { "nestedTag" }, |
| 62 | [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning" }, |
| 63 | [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists" }, |
| 64 | [ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst" }, |
| 65 | [ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce" }, |
| 66 | [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent" }, |
| 67 | [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching" }, |
| 68 | [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate" }, |
| 69 | [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName" }, |
| 70 | [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected" }, |
| 71 | [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward" }, /* backwards compatibility */ |
Kristoffer Haugsbakk | 8fbd903 | 2024-03-05 21:29:43 +0100 | [diff] [blame] | 72 | [ADVICE_REF_SYNTAX] = { "refSyntax" }, |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 73 | [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh" }, |
| 74 | [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict" }, |
| 75 | [ADVICE_RM_HINTS] = { "rmHints" }, |
| 76 | [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse" }, |
| 77 | [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure" }, |
| 78 | [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks" }, |
| 79 | [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning" }, |
| 80 | [ADVICE_STATUS_HINTS] = { "statusHints" }, |
| 81 | [ADVICE_STATUS_U_OPTION] = { "statusUoption" }, |
| 82 | [ADVICE_SUBMODULES_NOT_UPDATED] = { "submodulesNotUpdated" }, |
| 83 | [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie" }, |
Philippe Blain | b9e55be | 2024-02-26 13:27:28 +0000 | [diff] [blame] | 84 | [ADVICE_SUBMODULE_MERGE_CONFLICT] = { "submoduleMergeConflict" }, |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 85 | [ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead" }, |
| 86 | [ADVICE_UPDATE_SPARSE_PATH] = { "updateSparsePath" }, |
| 87 | [ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor" }, |
| 88 | [ADVICE_WORKTREE_ADD_ORPHAN] = { "worktreeAddOrphan" }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 89 | }; |
| 90 | |
| 91 | static const char turn_off_instructions[] = |
| 92 | N_("\n" |
| 93 | "Disable this message with \"git config advice.%s false\""); |
| 94 | |
| 95 | static void vadvise(const char *advice, int display_instructions, |
| 96 | const char *key, va_list params) |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 97 | { |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 98 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 99 | const char *cp, *np; |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 100 | |
Jeff King | 447b99c | 2012-07-23 14:48:57 -0400 | [diff] [blame] | 101 | strbuf_vaddf(&buf, advice, params); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 102 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 103 | if (display_instructions) |
| 104 | strbuf_addf(&buf, turn_off_instructions, key); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 105 | |
| 106 | for (cp = buf.buf; *cp; cp = np) { |
| 107 | np = strchrnul(cp, '\n'); |
Junio C Hamano | 2d8cf94 | 2024-03-29 15:57:06 -0700 | [diff] [blame] | 108 | fprintf(stderr, _("%shint:%s%.*s%s\n"), |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 109 | advise_get_color(ADVICE_COLOR_HINT), |
Junio C Hamano | 2d8cf94 | 2024-03-29 15:57:06 -0700 | [diff] [blame] | 110 | (np == cp) ? "" : " ", |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 111 | (int)(np - cp), cp, |
| 112 | advise_get_color(ADVICE_COLOR_RESET)); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 113 | if (*np) |
| 114 | np++; |
| 115 | } |
| 116 | strbuf_release(&buf); |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 117 | } |
| 118 | |
Heba Waly | 06ac2b3 | 2020-03-02 20:01:57 +0000 | [diff] [blame] | 119 | void advise(const char *advice, ...) |
| 120 | { |
| 121 | va_list params; |
| 122 | va_start(params, advice); |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 123 | vadvise(advice, 0, "", params); |
| 124 | va_end(params); |
| 125 | } |
| 126 | |
| 127 | int advice_enabled(enum advice_type type) |
| 128 | { |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 129 | int enabled = advice_setting[type].level != ADVICE_LEVEL_DISABLED; |
| 130 | |
| 131 | if (type == ADVICE_PUSH_UPDATE_REJECTED) |
| 132 | return enabled && |
| 133 | advice_enabled(ADVICE_PUSH_UPDATE_REJECTED_ALIAS); |
| 134 | |
| 135 | return enabled; |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 136 | } |
| 137 | |
| 138 | void advise_if_enabled(enum advice_type type, const char *advice, ...) |
| 139 | { |
| 140 | va_list params; |
| 141 | |
| 142 | if (!advice_enabled(type)) |
| 143 | return; |
| 144 | |
| 145 | va_start(params, advice); |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 146 | vadvise(advice, !advice_setting[type].level, advice_setting[type].key, |
| 147 | params); |
Heba Waly | 06ac2b3 | 2020-03-02 20:01:57 +0000 | [diff] [blame] | 148 | va_end(params); |
| 149 | } |
| 150 | |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 151 | int git_default_advice_config(const char *var, const char *value) |
| 152 | { |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 153 | const char *k, *slot_name; |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 154 | int i; |
| 155 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 156 | if (!strcmp(var, "color.advice")) { |
| 157 | advice_use_color = git_config_colorbool(var, value); |
| 158 | return 0; |
| 159 | } |
| 160 | |
| 161 | if (skip_prefix(var, "color.advice.", &slot_name)) { |
| 162 | int slot = parse_advise_color_slot(slot_name); |
| 163 | if (slot < 0) |
| 164 | return 0; |
| 165 | if (!value) |
| 166 | return config_error_nonbool(var); |
| 167 | return color_parse(value, advice_colors[slot]); |
| 168 | } |
| 169 | |
Jeff King | cf4fff5 | 2014-06-18 15:44:19 -0400 | [diff] [blame] | 170 | if (!skip_prefix(var, "advice.", &k)) |
| 171 | return 0; |
| 172 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 173 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) { |
| 174 | if (strcasecmp(k, advice_setting[i].key)) |
| 175 | continue; |
Rubén Justo | d919965 | 2024-01-15 15:28:28 +0100 | [diff] [blame] | 176 | advice_setting[i].level = git_config_bool(var, value) |
| 177 | ? ADVICE_LEVEL_ENABLED |
| 178 | : ADVICE_LEVEL_DISABLED; |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 179 | return 0; |
| 180 | } |
| 181 | |
| 182 | return 0; |
| 183 | } |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 184 | |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 185 | void list_config_advices(struct string_list *list, const char *prefix) |
| 186 | { |
| 187 | int i; |
| 188 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 189 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) |
| 190 | list_config_item(list, prefix, advice_setting[i].key); |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 191 | } |
| 192 | |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 193 | int error_resolve_conflict(const char *me) |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 194 | { |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 195 | if (!strcmp(me, "cherry-pick")) |
| 196 | error(_("Cherry-picking is not possible because you have unmerged files.")); |
| 197 | else if (!strcmp(me, "commit")) |
| 198 | error(_("Committing is not possible because you have unmerged files.")); |
| 199 | else if (!strcmp(me, "merge")) |
| 200 | error(_("Merging is not possible because you have unmerged files.")); |
| 201 | else if (!strcmp(me, "pull")) |
| 202 | error(_("Pulling is not possible because you have unmerged files.")); |
| 203 | else if (!strcmp(me, "revert")) |
| 204 | error(_("Reverting is not possible because you have unmerged files.")); |
Oswald Buddenhagen | ff29a61 | 2023-08-07 19:09:35 +0200 | [diff] [blame] | 205 | else if (!strcmp(me, "rebase")) |
| 206 | error(_("Rebasing is not possible because you have unmerged files.")); |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 207 | else |
Oswald Buddenhagen | ff29a61 | 2023-08-07 19:09:35 +0200 | [diff] [blame] | 208 | BUG("Unhandled conflict reason '%s'", me); |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 209 | |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 210 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 211 | /* |
| 212 | * Message used both when 'git commit' fails and when |
| 213 | * other commands doing a merge do. |
| 214 | */ |
Jeff King | c057b24 | 2014-06-03 03:17:17 -0400 | [diff] [blame] | 215 | advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
Matthieu Moy | 91e70e0 | 2014-08-28 11:46:58 +0200 | [diff] [blame] | 216 | "as appropriate to mark resolution and make a commit.")); |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 217 | return -1; |
| 218 | } |
| 219 | |
| 220 | void NORETURN die_resolve_conflict(const char *me) |
| 221 | { |
| 222 | error_resolve_conflict(me); |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 223 | die(_("Exiting because of an unresolved conflict.")); |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 224 | } |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 225 | |
Paul Tan | 4a4cf9e | 2015-06-18 18:54:04 +0800 | [diff] [blame] | 226 | void NORETURN die_conclude_merge(void) |
| 227 | { |
| 228 | error(_("You have not concluded your merge (MERGE_HEAD exists).")); |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 229 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
Alex Henrie | b744767 | 2015-10-01 22:25:33 -0600 | [diff] [blame] | 230 | advise(_("Please, commit your changes before merging.")); |
Paul Tan | 4a4cf9e | 2015-06-18 18:54:04 +0800 | [diff] [blame] | 231 | die(_("Exiting because of unfinished merge.")); |
| 232 | } |
| 233 | |
Alex Henrie | 3d5fc24 | 2021-07-21 01:42:19 +0000 | [diff] [blame] | 234 | void NORETURN die_ff_impossible(void) |
| 235 | { |
Felipe Contreras | 765071a | 2023-03-07 20:48:33 -0600 | [diff] [blame] | 236 | advise_if_enabled(ADVICE_DIVERGING, |
| 237 | _("Diverging branches can't be fast-forwarded, you need to either:\n" |
| 238 | "\n" |
| 239 | "\tgit merge --no-ff\n" |
| 240 | "\n" |
| 241 | "or:\n" |
| 242 | "\n" |
| 243 | "\tgit rebase\n")); |
Alex Henrie | 3d5fc24 | 2021-07-21 01:42:19 +0000 | [diff] [blame] | 244 | die(_("Not possible to fast-forward, aborting.")); |
| 245 | } |
| 246 | |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 247 | void advise_on_updating_sparse_paths(struct string_list *pathspec_list) |
| 248 | { |
| 249 | struct string_list_item *item; |
| 250 | |
| 251 | if (!pathspec_list->nr) |
| 252 | return; |
| 253 | |
Derrick Stolee | 6579e78 | 2021-09-24 15:39:14 +0000 | [diff] [blame] | 254 | fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n" |
| 255 | "outside of your sparse-checkout definition, so will not be\n" |
| 256 | "updated in the index:\n")); |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 257 | for_each_string_list_item(item, pathspec_list) |
| 258 | fprintf(stderr, "%s\n", item->string); |
| 259 | |
| 260 | advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, |
Derrick Stolee | 6579e78 | 2021-09-24 15:39:14 +0000 | [diff] [blame] | 261 | _("If you intend to update such entries, try one of the following:\n" |
| 262 | "* Use the --sparse option.\n" |
| 263 | "* Disable or modify the sparsity rules.")); |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 264 | } |
| 265 | |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 266 | void detach_advice(const char *new_name) |
| 267 | { |
Vasco Almeida | e9f3cec | 2016-06-17 20:20:51 +0000 | [diff] [blame] | 268 | const char *fmt = |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 269 | _("Note: switching to '%s'.\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 270 | "\n" |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 271 | "You are in 'detached HEAD' state. You can look around, make experimental\n" |
| 272 | "changes and commit them, and you can discard any commits you make in this\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 273 | "state without impacting any branches by switching back to a branch.\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 274 | "\n" |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 275 | "If you want to create a new branch to retain commits you create, you may\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 276 | "do so (now or later) by using -c with the switch command. Example:\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 277 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 278 | " git switch -c <new-branch-name>\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 279 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 280 | "Or undo this operation with:\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 281 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 282 | " git switch -\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 283 | "\n" |
| 284 | "Turn off this advice by setting config variable advice.detachedHead to false\n\n"); |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 285 | |
| 286 | fprintf(stderr, fmt, new_name); |
| 287 | } |
Shaoxuan Yuan | 5efd533 | 2022-08-09 20:09:09 +0800 | [diff] [blame] | 288 | |
| 289 | void advise_on_moving_dirty_path(struct string_list *pathspec_list) |
| 290 | { |
| 291 | struct string_list_item *item; |
| 292 | |
| 293 | if (!pathspec_list->nr) |
| 294 | return; |
| 295 | |
| 296 | fprintf(stderr, _("The following paths have been moved outside the\n" |
| 297 | "sparse-checkout definition but are not sparse due to local\n" |
| 298 | "modifications.\n")); |
| 299 | for_each_string_list_item(item, pathspec_list) |
| 300 | fprintf(stderr, "%s\n", item->string); |
| 301 | |
| 302 | advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, |
| 303 | _("To correct the sparsity of these paths, do the following:\n" |
| 304 | "* Use \"git add --sparse <paths>\" to update the index\n" |
| 305 | "* Use \"git sparse-checkout reapply\" to apply the sparsity rules")); |
| 306 | } |