Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 1 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 2 | #include "config.h" |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 3 | #include "color.h" |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 4 | #include "help.h" |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 5 | #include "string-list.h" |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 6 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 7 | static int advice_use_color = -1; |
| 8 | static char advice_colors[][COLOR_MAXLEN] = { |
| 9 | GIT_COLOR_RESET, |
| 10 | GIT_COLOR_YELLOW, /* HINT */ |
| 11 | }; |
| 12 | |
| 13 | enum color_advice { |
| 14 | ADVICE_COLOR_RESET = 0, |
| 15 | ADVICE_COLOR_HINT = 1, |
| 16 | }; |
| 17 | |
| 18 | static int parse_advise_color_slot(const char *slot) |
| 19 | { |
| 20 | if (!strcasecmp(slot, "reset")) |
| 21 | return ADVICE_COLOR_RESET; |
| 22 | if (!strcasecmp(slot, "hint")) |
| 23 | return ADVICE_COLOR_HINT; |
| 24 | return -1; |
| 25 | } |
| 26 | |
| 27 | static const char *advise_get_color(enum color_advice ix) |
| 28 | { |
| 29 | if (want_color_stderr(advice_use_color)) |
| 30 | return advice_colors[ix]; |
| 31 | return ""; |
| 32 | } |
| 33 | |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 34 | static struct { |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 35 | const char *key; |
| 36 | int enabled; |
| 37 | } advice_setting[] = { |
| 38 | [ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 }, |
Ben Boeckel | 6929055 | 2021-08-23 12:43:59 +0200 | [diff] [blame] | 39 | [ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 }, |
| 40 | [ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 41 | [ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 }, |
Tao Klerks | e4921d8 | 2022-04-01 06:05:13 +0000 | [diff] [blame] | 42 | [ADVICE_AMBIGUOUS_FETCH_REFSPEC] = { "ambiguousFetchRefspec", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 43 | [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 }, |
| 44 | [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 }, |
| 45 | [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, |
Alex Henrie | 808213b | 2022-02-25 23:12:13 -0700 | [diff] [blame] | 46 | [ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 47 | [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 }, |
| 48 | [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 }, |
| 49 | [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 }, |
| 50 | [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity", 1 }, |
| 51 | [ADVICE_NESTED_TAG] = { "nestedTag", 1 }, |
| 52 | [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning", 1 }, |
| 53 | [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 }, |
| 54 | [ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 }, |
| 55 | [ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 }, |
Srinidhi Kaushik | 3b990aa | 2020-10-03 17:40:45 +0530 | [diff] [blame] | 56 | [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 57 | |
| 58 | /* make this an alias for backward compatibility */ |
| 59 | [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 }, |
| 60 | |
| 61 | [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent", 1 }, |
| 62 | [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 }, |
| 63 | [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 }, |
| 64 | [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 }, |
Victoria Dye | 9396251 | 2022-03-15 01:49:40 +0000 | [diff] [blame] | 65 | [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 66 | [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 }, |
| 67 | [ADVICE_RM_HINTS] = { "rmHints", 1 }, |
| 68 | [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 }, |
| 69 | [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure", 1 }, |
Josh Steadmon | 767a4ca | 2021-08-30 14:46:02 -0700 | [diff] [blame] | 70 | [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 71 | [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning", 1 }, |
| 72 | [ADVICE_STATUS_HINTS] = { "statusHints", 1 }, |
| 73 | [ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 }, |
| 74 | [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 }, |
Glen Choo | 961b130 | 2022-01-28 16:04:45 -0800 | [diff] [blame] | 75 | [ADVICE_SUBMODULES_NOT_UPDATED] = { "submodulesNotUpdated", 1 }, |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 76 | [ADVICE_UPDATE_SPARSE_PATH] = { "updateSparsePath", 1 }, |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 77 | [ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 }, |
| 78 | }; |
| 79 | |
| 80 | static const char turn_off_instructions[] = |
| 81 | N_("\n" |
| 82 | "Disable this message with \"git config advice.%s false\""); |
| 83 | |
| 84 | static void vadvise(const char *advice, int display_instructions, |
| 85 | const char *key, va_list params) |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 86 | { |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 87 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 88 | const char *cp, *np; |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 89 | |
Jeff King | 447b99c | 2012-07-23 14:48:57 -0400 | [diff] [blame] | 90 | strbuf_vaddf(&buf, advice, params); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 91 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 92 | if (display_instructions) |
| 93 | strbuf_addf(&buf, turn_off_instructions, key); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 94 | |
| 95 | for (cp = buf.buf; *cp; cp = np) { |
| 96 | np = strchrnul(cp, '\n'); |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 97 | fprintf(stderr, _("%shint: %.*s%s\n"), |
| 98 | advise_get_color(ADVICE_COLOR_HINT), |
| 99 | (int)(np - cp), cp, |
| 100 | advise_get_color(ADVICE_COLOR_RESET)); |
Junio C Hamano | 23cb5bf | 2011-12-22 11:21:26 -0800 | [diff] [blame] | 101 | if (*np) |
| 102 | np++; |
| 103 | } |
| 104 | strbuf_release(&buf); |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 105 | } |
| 106 | |
Heba Waly | 06ac2b3 | 2020-03-02 20:01:57 +0000 | [diff] [blame] | 107 | void advise(const char *advice, ...) |
| 108 | { |
| 109 | va_list params; |
| 110 | va_start(params, advice); |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 111 | vadvise(advice, 0, "", params); |
| 112 | va_end(params); |
| 113 | } |
| 114 | |
| 115 | int advice_enabled(enum advice_type type) |
| 116 | { |
| 117 | switch(type) { |
| 118 | case ADVICE_PUSH_UPDATE_REJECTED: |
| 119 | return advice_setting[ADVICE_PUSH_UPDATE_REJECTED].enabled && |
| 120 | advice_setting[ADVICE_PUSH_UPDATE_REJECTED_ALIAS].enabled; |
| 121 | default: |
| 122 | return advice_setting[type].enabled; |
| 123 | } |
| 124 | } |
| 125 | |
| 126 | void advise_if_enabled(enum advice_type type, const char *advice, ...) |
| 127 | { |
| 128 | va_list params; |
| 129 | |
| 130 | if (!advice_enabled(type)) |
| 131 | return; |
| 132 | |
| 133 | va_start(params, advice); |
| 134 | vadvise(advice, 1, advice_setting[type].key, params); |
Heba Waly | 06ac2b3 | 2020-03-02 20:01:57 +0000 | [diff] [blame] | 135 | va_end(params); |
| 136 | } |
| 137 | |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 138 | int git_default_advice_config(const char *var, const char *value) |
| 139 | { |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 140 | const char *k, *slot_name; |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 141 | int i; |
| 142 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 143 | if (!strcmp(var, "color.advice")) { |
| 144 | advice_use_color = git_config_colorbool(var, value); |
| 145 | return 0; |
| 146 | } |
| 147 | |
| 148 | if (skip_prefix(var, "color.advice.", &slot_name)) { |
| 149 | int slot = parse_advise_color_slot(slot_name); |
| 150 | if (slot < 0) |
| 151 | return 0; |
| 152 | if (!value) |
| 153 | return config_error_nonbool(var); |
| 154 | return color_parse(value, advice_colors[slot]); |
| 155 | } |
| 156 | |
Jeff King | cf4fff5 | 2014-06-18 15:44:19 -0400 | [diff] [blame] | 157 | if (!skip_prefix(var, "advice.", &k)) |
| 158 | return 0; |
| 159 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 160 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) { |
| 161 | if (strcasecmp(k, advice_setting[i].key)) |
| 162 | continue; |
| 163 | advice_setting[i].enabled = git_config_bool(var, value); |
Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 164 | return 0; |
| 165 | } |
| 166 | |
| 167 | return 0; |
| 168 | } |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 169 | |
Nguyễn Thái Ngọc Duy | 3ac68a9 | 2018-05-26 15:55:24 +0200 | [diff] [blame] | 170 | void list_config_advices(struct string_list *list, const char *prefix) |
| 171 | { |
| 172 | int i; |
| 173 | |
Heba Waly | b3b18d1 | 2020-03-02 20:01:59 +0000 | [diff] [blame] | 174 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) |
| 175 | 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] | 176 | } |
| 177 | |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 178 | int error_resolve_conflict(const char *me) |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 179 | { |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 180 | if (!strcmp(me, "cherry-pick")) |
| 181 | error(_("Cherry-picking is not possible because you have unmerged files.")); |
| 182 | else if (!strcmp(me, "commit")) |
| 183 | error(_("Committing is not possible because you have unmerged files.")); |
| 184 | else if (!strcmp(me, "merge")) |
| 185 | error(_("Merging is not possible because you have unmerged files.")); |
| 186 | else if (!strcmp(me, "pull")) |
| 187 | error(_("Pulling is not possible because you have unmerged files.")); |
| 188 | else if (!strcmp(me, "revert")) |
| 189 | error(_("Reverting is not possible because you have unmerged files.")); |
| 190 | else |
| 191 | error(_("It is not possible to %s because you have unmerged files."), |
| 192 | me); |
| 193 | |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 194 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 195 | /* |
| 196 | * Message used both when 'git commit' fails and when |
| 197 | * other commands doing a merge do. |
| 198 | */ |
Jeff King | c057b24 | 2014-06-03 03:17:17 -0400 | [diff] [blame] | 199 | 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] | 200 | "as appropriate to mark resolution and make a commit.")); |
Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 201 | return -1; |
| 202 | } |
| 203 | |
| 204 | void NORETURN die_resolve_conflict(const char *me) |
| 205 | { |
| 206 | error_resolve_conflict(me); |
Vasco Almeida | 8785c42 | 2016-06-17 20:20:52 +0000 | [diff] [blame] | 207 | die(_("Exiting because of an unresolved conflict.")); |
Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 208 | } |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 209 | |
Paul Tan | 4a4cf9e | 2015-06-18 18:54:04 +0800 | [diff] [blame] | 210 | void NORETURN die_conclude_merge(void) |
| 211 | { |
| 212 | error(_("You have not concluded your merge (MERGE_HEAD exists).")); |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 213 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
Alex Henrie | b744767 | 2015-10-01 22:25:33 -0600 | [diff] [blame] | 214 | advise(_("Please, commit your changes before merging.")); |
Paul Tan | 4a4cf9e | 2015-06-18 18:54:04 +0800 | [diff] [blame] | 215 | die(_("Exiting because of unfinished merge.")); |
| 216 | } |
| 217 | |
Alex Henrie | 3d5fc24 | 2021-07-21 01:42:19 +0000 | [diff] [blame] | 218 | void NORETURN die_ff_impossible(void) |
| 219 | { |
| 220 | die(_("Not possible to fast-forward, aborting.")); |
| 221 | } |
| 222 | |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 223 | void advise_on_updating_sparse_paths(struct string_list *pathspec_list) |
| 224 | { |
| 225 | struct string_list_item *item; |
| 226 | |
| 227 | if (!pathspec_list->nr) |
| 228 | return; |
| 229 | |
Derrick Stolee | 6579e78 | 2021-09-24 15:39:14 +0000 | [diff] [blame] | 230 | fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n" |
| 231 | "outside of your sparse-checkout definition, so will not be\n" |
| 232 | "updated in the index:\n")); |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 233 | for_each_string_list_item(item, pathspec_list) |
| 234 | fprintf(stderr, "%s\n", item->string); |
| 235 | |
| 236 | advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, |
Derrick Stolee | 6579e78 | 2021-09-24 15:39:14 +0000 | [diff] [blame] | 237 | _("If you intend to update such entries, try one of the following:\n" |
| 238 | "* Use the --sparse option.\n" |
| 239 | "* Disable or modify the sparsity rules.")); |
Matheus Tavares | a20f704 | 2021-04-08 17:41:27 -0300 | [diff] [blame] | 240 | } |
| 241 | |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 242 | void detach_advice(const char *new_name) |
| 243 | { |
Vasco Almeida | e9f3cec | 2016-06-17 20:20:51 +0000 | [diff] [blame] | 244 | const char *fmt = |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 245 | _("Note: switching to '%s'.\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 246 | "\n" |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 247 | "You are in 'detached HEAD' state. You can look around, make experimental\n" |
| 248 | "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] | 249 | "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] | 250 | "\n" |
Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 251 | "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] | 252 | "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] | 253 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 254 | " git switch -c <new-branch-name>\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 255 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 256 | "Or undo this operation with:\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 257 | "\n" |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 258 | " git switch -\n" |
Nguyễn Thái Ngọc Duy | af9ded5 | 2019-03-29 17:38:58 +0700 | [diff] [blame] | 259 | "\n" |
| 260 | "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] | 261 | |
| 262 | fprintf(stderr, fmt, new_name); |
| 263 | } |