]>
Commit | Line | Data |
---|---|---|
f5bbc322 KH |
1 | /* |
2 | * Builtin "git commit" | |
3 | * | |
4 | * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com> | |
5 | * Based on git-commit.sh by Junio C Hamano and Linus Torvalds | |
6 | */ | |
7 | ||
f8adbec9 | 8 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
f5bbc322 | 9 | #include "cache.h" |
b2141fc1 | 10 | #include "config.h" |
697cc8ef | 11 | #include "lockfile.h" |
f5bbc322 | 12 | #include "cache-tree.h" |
6b2f2d98 | 13 | #include "color.h" |
2888605c | 14 | #include "dir.h" |
f5bbc322 KH |
15 | #include "builtin.h" |
16 | #include "diff.h" | |
17 | #include "diffcore.h" | |
18 | #include "commit.h" | |
19 | #include "revision.h" | |
20 | #include "wt-status.h" | |
21 | #include "run-command.h" | |
5e3aba33 | 22 | #include "hook.h" |
f5bbc322 KH |
23 | #include "refs.h" |
24 | #include "log-tree.h" | |
25 | #include "strbuf.h" | |
26 | #include "utf8.h" | |
27 | #include "parse-options.h" | |
c455c87c | 28 | #include "string-list.h" |
5b2fd956 | 29 | #include "rerere.h" |
fa9dcf80 | 30 | #include "unpack-trees.h" |
76e2f7ce | 31 | #include "quote.h" |
302ad7a9 | 32 | #include "submodule.h" |
ba3c69a9 | 33 | #include "gpg-interface.h" |
323d0530 | 34 | #include "column.h" |
5ed75e2a | 35 | #include "sequencer.h" |
ea16794e | 36 | #include "mailmap.h" |
3ac68a93 | 37 | #include "help.h" |
64043556 | 38 | #include "commit-reach.h" |
859fdc0c | 39 | #include "commit-graph.h" |
88c7b4c3 | 40 | #include "pretty.h" |
f5bbc322 KH |
41 | |
42 | static const char * const builtin_commit_usage[] = { | |
423be1f8 ÆAB |
43 | N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" |
44 | " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n" | |
45 | " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" | |
46 | " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" | |
47 | " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" | |
48 | " [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" | |
49 | " [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" | |
50 | " [--] [<pathspec>...]"), | |
f5bbc322 KH |
51 | NULL |
52 | }; | |
53 | ||
2f02b25f | 54 | static const char * const builtin_status_usage[] = { |
463ea0cf | 55 | N_("git status [<options>] [--] [<pathspec>...]"), |
2f02b25f SB |
56 | NULL |
57 | }; | |
58 | ||
f197ed2f | 59 | static const char empty_amend_advice[] = |
fc88e316 | 60 | N_("You asked to amend the most recent commit, but doing so would make\n" |
f197ed2f | 61 | "it empty. You can repeat your command with --allow-empty, or you can\n" |
fc88e316 | 62 | "remove the commit entirely with \"git reset HEAD^\".\n"); |
f197ed2f | 63 | |
37f7a857 | 64 | static const char empty_cherry_pick_advice[] = |
6c80cd29 | 65 | N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n" |
37f7a857 JS |
66 | "If you wish to commit it anyway, use:\n" |
67 | "\n" | |
68 | " git commit --allow-empty\n" | |
c17592a7 JK |
69 | "\n"); |
70 | ||
430b75f7 PW |
71 | static const char empty_rebase_pick_advice[] = |
72 | N_("Otherwise, please use 'git rebase --skip'\n"); | |
73 | ||
c17592a7 | 74 | static const char empty_cherry_pick_advice_single[] = |
dcb500dc | 75 | N_("Otherwise, please use 'git cherry-pick --skip'\n"); |
c17592a7 JK |
76 | |
77 | static const char empty_cherry_pick_advice_multi[] = | |
dcb500dc | 78 | N_("and then use:\n" |
37f7a857 | 79 | "\n" |
dcb500dc | 80 | " git cherry-pick --continue\n" |
c17592a7 | 81 | "\n" |
dcb500dc RA |
82 | "to resume cherry-picking the remaining commits.\n" |
83 | "If you wish to skip this commit, use:\n" | |
84 | "\n" | |
85 | " git cherry-pick --skip\n" | |
86 | "\n"); | |
37f7a857 | 87 | |
a73b3680 NTND |
88 | static const char *color_status_slots[] = { |
89 | [WT_STATUS_HEADER] = "header", | |
90 | [WT_STATUS_UPDATED] = "updated", | |
91 | [WT_STATUS_CHANGED] = "changed", | |
92 | [WT_STATUS_UNTRACKED] = "untracked", | |
93 | [WT_STATUS_NOBRANCH] = "noBranch", | |
94 | [WT_STATUS_UNMERGED] = "unmerged", | |
95 | [WT_STATUS_LOCAL_BRANCH] = "localBranch", | |
96 | [WT_STATUS_REMOTE_BRANCH] = "remoteBranch", | |
97 | [WT_STATUS_ONBRANCH] = "branch", | |
98 | }; | |
99 | ||
37f7a857 | 100 | static const char *use_message_buffer; |
2888605c JH |
101 | static struct lock_file index_lock; /* real index */ |
102 | static struct lock_file false_lock; /* used only for partial commits */ | |
103 | static enum { | |
104 | COMMIT_AS_IS = 1, | |
105 | COMMIT_NORMAL, | |
4b05548f | 106 | COMMIT_PARTIAL |
2888605c | 107 | } commit_style; |
f5bbc322 | 108 | |
dbd0f5c7 | 109 | static const char *logfile, *force_author; |
984c6e7e | 110 | static const char *template_file; |
37f7a857 JS |
111 | /* |
112 | * The _message variables are commit names from which to take | |
113 | * the commit message and/or authorship. | |
114 | */ | |
115 | static const char *author_message, *author_message_buffer; | |
f5bbc322 | 116 | static char *edit_message, *use_message; |
494d314a CM |
117 | static char *fixup_message, *fixup_commit, *squash_message; |
118 | static const char *fixup_prefix; | |
ca1ba201 JH |
119 | static int all, also, interactive, patch_interactive, only, amend, signoff; |
120 | static int edit_flag = -1; /* unspecified */ | |
c51f6cee | 121 | static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship; |
aaab8420 | 122 | static int config_commit_verbose = -1; /* unspecified */ |
e440fc58 | 123 | static int no_post_rewrite, allow_empty_message, pathspec_file_nul; |
eec0f7f2 | 124 | static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; |
e440fc58 | 125 | static char *sign_commit, *pathspec_from_file; |
2daae3d1 | 126 | static struct strvec trailer_args = STRVEC_INIT; |
ba3c69a9 | 127 | |
5f065737 AR |
128 | /* |
129 | * The default commit message cleanup mode will remove the lines | |
130 | * beginning with # (shell comments) and leading and trailing | |
131 | * whitespaces (empty lines or containing only whitespaces) | |
132 | * if editor is used, and only the whitespaces if the message | |
133 | * is specified explicitly. | |
134 | */ | |
d0aaa46f | 135 | static enum commit_msg_cleanup_mode cleanup_mode; |
51fb3a3d | 136 | static const char *cleanup_arg; |
f5bbc322 | 137 | |
37f7a857 | 138 | static enum commit_whence whence; |
06bb643b | 139 | static int use_editor = 1, include_status = 1; |
eec0f7f2 | 140 | static int have_option_m; |
2c47789d | 141 | static struct strbuf message = STRBUF_INIT; |
f9568530 | 142 | |
be7e795e | 143 | static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED; |
84b4202d | 144 | |
2daae3d1 ZH |
145 | static int opt_pass_trailer(const struct option *opt, const char *arg, int unset) |
146 | { | |
147 | BUG_ON_OPT_NEG(unset); | |
148 | ||
116761ba | 149 | strvec_pushl(opt->value, "--trailer", arg, NULL); |
2daae3d1 ZH |
150 | return 0; |
151 | } | |
152 | ||
c4f596b9 JH |
153 | static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset) |
154 | { | |
155 | enum wt_status_format *value = (enum wt_status_format *)opt->value; | |
156 | if (unset) | |
157 | *value = STATUS_FORMAT_NONE; | |
158 | else if (!arg) | |
159 | *value = STATUS_FORMAT_PORCELAIN; | |
160 | else if (!strcmp(arg, "v1") || !strcmp(arg, "1")) | |
161 | *value = STATUS_FORMAT_PORCELAIN; | |
1ecdecce JH |
162 | else if (!strcmp(arg, "v2") || !strcmp(arg, "2")) |
163 | *value = STATUS_FORMAT_PORCELAIN_V2; | |
c4f596b9 JH |
164 | else |
165 | die("unsupported porcelain version '%s'", arg); | |
166 | ||
167 | return 0; | |
168 | } | |
7c9f7038 | 169 | |
f9568530 JS |
170 | static int opt_parse_m(const struct option *opt, const char *arg, int unset) |
171 | { | |
172 | struct strbuf *buf = opt->value; | |
25206778 RS |
173 | if (unset) { |
174 | have_option_m = 0; | |
f9568530 | 175 | strbuf_setlen(buf, 0); |
25206778 RS |
176 | } else { |
177 | have_option_m = 1; | |
a24a41ea BC |
178 | if (buf->len) |
179 | strbuf_addch(buf, '\n'); | |
f9568530 | 180 | strbuf_addstr(buf, arg); |
a24a41ea | 181 | strbuf_complete_line(buf); |
f9568530 JS |
182 | } |
183 | return 0; | |
184 | } | |
f5bbc322 | 185 | |
e8b2dc2c BP |
186 | static int opt_parse_rename_score(const struct option *opt, const char *arg, int unset) |
187 | { | |
188 | const char **value = opt->value; | |
517fe807 JK |
189 | |
190 | BUG_ON_OPT_NEG(unset); | |
191 | ||
e8b2dc2c BP |
192 | if (arg != NULL && *arg == '=') |
193 | arg = arg + 1; | |
194 | ||
195 | *value = arg; | |
196 | return 0; | |
197 | } | |
198 | ||
37f7a857 JS |
199 | static void determine_whence(struct wt_status *s) |
200 | { | |
102de880 | 201 | if (file_exists(git_path_merge_head(the_repository))) |
37f7a857 | 202 | whence = FROM_MERGE; |
901ba7b1 | 203 | else if (!sequencer_determine_whence(the_repository, &whence)) |
37f7a857 JS |
204 | whence = FROM_COMMIT; |
205 | if (s) | |
206 | s->whence = whence; | |
207 | } | |
208 | ||
5c25dfaa MM |
209 | static void status_init_config(struct wt_status *s, config_fn_t fn) |
210 | { | |
5b02ca38 | 211 | wt_status_prepare(the_repository, s); |
dc6b1d92 | 212 | init_diff_ui_defaults(); |
5c25dfaa MM |
213 | git_config(fn, s); |
214 | determine_whence(s); | |
ed9bff08 | 215 | s->hints = advice_enabled(ADVICE_STATUS_HINTS); /* must come after git_config() */ |
5c25dfaa MM |
216 | } |
217 | ||
2888605c JH |
218 | static void rollback_index_files(void) |
219 | { | |
220 | switch (commit_style) { | |
221 | case COMMIT_AS_IS: | |
222 | break; /* nothing to do */ | |
223 | case COMMIT_NORMAL: | |
224 | rollback_lock_file(&index_lock); | |
225 | break; | |
226 | case COMMIT_PARTIAL: | |
227 | rollback_lock_file(&index_lock); | |
228 | rollback_lock_file(&false_lock); | |
229 | break; | |
230 | } | |
231 | } | |
232 | ||
5a9dd399 | 233 | static int commit_index_files(void) |
2888605c | 234 | { |
5a9dd399 BC |
235 | int err = 0; |
236 | ||
2888605c JH |
237 | switch (commit_style) { |
238 | case COMMIT_AS_IS: | |
239 | break; /* nothing to do */ | |
240 | case COMMIT_NORMAL: | |
5a9dd399 | 241 | err = commit_lock_file(&index_lock); |
2888605c JH |
242 | break; |
243 | case COMMIT_PARTIAL: | |
5a9dd399 | 244 | err = commit_lock_file(&index_lock); |
2888605c JH |
245 | rollback_lock_file(&false_lock); |
246 | break; | |
247 | } | |
5a9dd399 BC |
248 | |
249 | return err; | |
2888605c JH |
250 | } |
251 | ||
252 | /* | |
253 | * Take a union of paths in the index and the named tree (typically, "HEAD"), | |
254 | * and return the paths that match the given pattern in list. | |
255 | */ | |
c455c87c | 256 | static int list_paths(struct string_list *list, const char *with_tree, |
c5c33504 | 257 | const struct pathspec *pattern) |
2888605c | 258 | { |
5d0b9bf8 | 259 | int i, ret; |
2888605c JH |
260 | char *m; |
261 | ||
17ddc66e | 262 | if (!pattern->nr) |
ea2d4ed3 JK |
263 | return 0; |
264 | ||
17ddc66e | 265 | m = xcalloc(1, pattern->nr); |
2888605c | 266 | |
8894d535 | 267 | if (with_tree) { |
f950eb95 | 268 | char *max_prefix = common_prefix(pattern); |
86238e07 | 269 | overlay_tree_on_index(&the_index, with_tree, max_prefix); |
5879f568 | 270 | free(max_prefix); |
8894d535 | 271 | } |
2888605c | 272 | |
cb8388df DS |
273 | /* TODO: audit for interaction with sparse-index. */ |
274 | ensure_full_index(&the_index); | |
dc594180 ÆAB |
275 | for (i = 0; i < the_index.cache_nr; i++) { |
276 | const struct cache_entry *ce = the_index.cache[i]; | |
7fce6e3c NTND |
277 | struct string_list_item *item; |
278 | ||
7a51ed66 | 279 | if (ce->ce_flags & CE_UPDATE) |
e87e22d0 | 280 | continue; |
6d2df284 | 281 | if (!ce_path_match(&the_index, ce, pattern, m)) |
2888605c | 282 | continue; |
78a395d3 | 283 | item = string_list_insert(list, ce->name); |
7fce6e3c NTND |
284 | if (ce_skip_worktree(ce)) |
285 | item->util = item; /* better a valid pointer than a fake one */ | |
2888605c JH |
286 | } |
287 | ||
c5c33504 | 288 | ret = report_path_error(m, pattern); |
5d0b9bf8 SB |
289 | free(m); |
290 | return ret; | |
2888605c JH |
291 | } |
292 | ||
c455c87c | 293 | static void add_remove_files(struct string_list *list) |
2888605c JH |
294 | { |
295 | int i; | |
296 | for (i = 0; i < list->nr; i++) { | |
d177cab0 | 297 | struct stat st; |
c455c87c | 298 | struct string_list_item *p = &(list->items[i]); |
d177cab0 | 299 | |
7fce6e3c NTND |
300 | /* p->util is skip-worktree */ |
301 | if (p->util) | |
b4d1690d | 302 | continue; |
d177cab0 | 303 | |
c455c87c | 304 | if (!lstat(p->string, &st)) { |
fbc1ed62 | 305 | if (add_to_index(&the_index, p->string, &st, 0)) |
8a6179bc | 306 | die(_("updating files failed")); |
960b8ad1 | 307 | } else |
031b2033 | 308 | remove_file_from_index(&the_index, p->string); |
2888605c JH |
309 | } |
310 | } | |
311 | ||
06bb643b | 312 | static void create_base_index(const struct commit *current_head) |
fa9dcf80 LT |
313 | { |
314 | struct tree *tree; | |
315 | struct unpack_trees_options opts; | |
316 | struct tree_desc t; | |
317 | ||
06bb643b | 318 | if (!current_head) { |
07047d68 | 319 | discard_index(&the_index); |
fa9dcf80 LT |
320 | return; |
321 | } | |
322 | ||
323 | memset(&opts, 0, sizeof(opts)); | |
324 | opts.head_idx = 1; | |
325 | opts.index_only = 1; | |
326 | opts.merge = 1; | |
34110cd4 LT |
327 | opts.src_index = &the_index; |
328 | opts.dst_index = &the_index; | |
fa9dcf80 LT |
329 | |
330 | opts.fn = oneway_merge; | |
a9dbc179 | 331 | tree = parse_tree_indirect(¤t_head->object.oid); |
fa9dcf80 | 332 | if (!tree) |
8a6179bc | 333 | die(_("failed to unpack HEAD tree object")); |
fa9dcf80 LT |
334 | parse_tree(tree); |
335 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
336 | if (unpack_trees(1, &t, &opts)) |
337 | exit(128); /* We've already reported the error, finish dying */ | |
fa9dcf80 LT |
338 | } |
339 | ||
d38a30df MM |
340 | static void refresh_cache_or_die(int refresh_flags) |
341 | { | |
342 | /* | |
343 | * refresh_flags contains REFRESH_QUIET, so the only errors | |
344 | * are for unmerged entries. | |
345 | */ | |
07047d68 | 346 | if (refresh_index(&the_index, refresh_flags | REFRESH_IN_PORCELAIN, NULL, NULL, NULL)) |
d38a30df MM |
347 | die_resolve_conflict("commit"); |
348 | } | |
349 | ||
e885a84f | 350 | static const char *prepare_index(const char **argv, const char *prefix, |
35ff08be | 351 | const struct commit *current_head, int is_status) |
f5bbc322 | 352 | { |
dd1055ed | 353 | struct string_list partial = STRING_LIST_INIT_DUP; |
6654c889 | 354 | struct pathspec pathspec; |
50b7e70f | 355 | int refresh_flags = REFRESH_QUIET; |
b4fb09e4 | 356 | const char *ret; |
f5bbc322 | 357 | |
50b7e70f JH |
358 | if (is_status) |
359 | refresh_flags |= REFRESH_UNMERGED; | |
6654c889 NTND |
360 | parse_pathspec(&pathspec, 0, |
361 | PATHSPEC_PREFER_FULL, | |
362 | prefix, argv); | |
f5bbc322 | 363 | |
e440fc58 AM |
364 | if (pathspec_from_file) { |
365 | if (interactive) | |
12909b6b | 366 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch"); |
e440fc58 | 367 | |
509efef7 | 368 | if (all) |
12909b6b | 369 | die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "-a"); |
509efef7 | 370 | |
e440fc58 | 371 | if (pathspec.nr) |
246cac85 | 372 | die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file"); |
e440fc58 AM |
373 | |
374 | parse_pathspec_file(&pathspec, 0, | |
375 | PATHSPEC_PREFER_FULL, | |
376 | prefix, pathspec_from_file, pathspec_file_nul); | |
377 | } else if (pathspec_file_nul) { | |
6fa00ee8 | 378 | die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file"); |
e440fc58 AM |
379 | } |
380 | ||
494d314a CM |
381 | if (!pathspec.nr && (also || (only && !allow_empty && |
382 | (!amend || (fixup_message && strcmp(fixup_prefix, "amend")))))) | |
e440fc58 AM |
383 | die(_("No paths with --include/--only does not make sense.")); |
384 | ||
07047d68 | 385 | if (repo_read_index_preload(the_repository, &pathspec, 0) < 0) |
8a6179bc | 386 | die(_("index file corrupt")); |
671c9b7e | 387 | |
1020d087 | 388 | if (interactive) { |
c480eeb5 | 389 | char *old_index_env = NULL, *old_repo_index_file; |
07047d68 ÆAB |
390 | repo_hold_locked_index(the_repository, &index_lock, |
391 | LOCK_DIE_ON_ERROR); | |
1020d087 CI |
392 | |
393 | refresh_cache_or_die(refresh_flags); | |
394 | ||
812d6b00 | 395 | if (write_locked_index(&the_index, &index_lock, 0)) |
1020d087 CI |
396 | die(_("unable to create temporary index")); |
397 | ||
c480eeb5 JS |
398 | old_repo_index_file = the_repository->index_file; |
399 | the_repository->index_file = | |
400 | (char *)get_lock_file_path(&index_lock); | |
406bab38 | 401 | old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT)); |
c480eeb5 | 402 | setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1); |
1020d087 | 403 | |
e885a84f | 404 | if (interactive_add(argv, prefix, patch_interactive) != 0) |
1020d087 CI |
405 | die(_("interactive add failed")); |
406 | ||
c480eeb5 | 407 | the_repository->index_file = old_repo_index_file; |
1020d087 CI |
408 | if (old_index_env && *old_index_env) |
409 | setenv(INDEX_ENVIRONMENT, old_index_env, 1); | |
410 | else | |
411 | unsetenv(INDEX_ENVIRONMENT); | |
406bab38 | 412 | FREE_AND_NULL(old_index_env); |
1020d087 | 413 | |
07047d68 ÆAB |
414 | discard_index(&the_index); |
415 | read_index_from(&the_index, get_lock_file_path(&index_lock), | |
416 | get_git_dir()); | |
fcb864bc | 417 | if (cache_tree_update(&the_index, WRITE_TREE_SILENT) == 0) { |
3fd13cbc | 418 | if (reopen_lock_file(&index_lock) < 0) |
9c4d6c02 | 419 | die(_("unable to write index file")); |
812d6b00 | 420 | if (write_locked_index(&the_index, &index_lock, 0)) |
3fd13cbc | 421 | die(_("unable to update temporary index")); |
9c4d6c02 DT |
422 | } else |
423 | warning(_("Failed to update main cache tree")); | |
1020d087 CI |
424 | |
425 | commit_style = COMMIT_NORMAL; | |
dd1055ed MÅ |
426 | ret = get_lock_file_path(&index_lock); |
427 | goto out; | |
1020d087 CI |
428 | } |
429 | ||
2888605c JH |
430 | /* |
431 | * Non partial, non as-is commit. | |
432 | * | |
433 | * (1) get the real index; | |
434 | * (2) update the_index as necessary; | |
435 | * (3) write the_index out to the real index (still locked); | |
436 | * (4) return the name of the locked index file. | |
437 | * | |
438 | * The caller should run hooks on the locked real index, and | |
439 | * (A) if all goes well, commit the real index; | |
440 | * (B) on failure, rollback the real index. | |
441 | */ | |
6654c889 | 442 | if (all || (also && pathspec.nr)) { |
07047d68 ÆAB |
443 | repo_hold_locked_index(the_repository, &index_lock, |
444 | LOCK_DIE_ON_ERROR); | |
610d55af | 445 | add_files_to_cache(also ? prefix : NULL, &pathspec, 0); |
d38a30df | 446 | refresh_cache_or_die(refresh_flags); |
fcb864bc | 447 | cache_tree_update(&the_index, WRITE_TREE_SILENT); |
812d6b00 | 448 | if (write_locked_index(&the_index, &index_lock, 0)) |
8a6179bc | 449 | die(_("unable to write new_index file")); |
2888605c | 450 | commit_style = COMMIT_NORMAL; |
dd1055ed MÅ |
451 | ret = get_lock_file_path(&index_lock); |
452 | goto out; | |
f5bbc322 KH |
453 | } |
454 | ||
2888605c JH |
455 | /* |
456 | * As-is commit. | |
457 | * | |
458 | * (1) return the name of the real index file. | |
459 | * | |
73276235 MH |
460 | * The caller should run hooks on the real index, |
461 | * and create commit from the_index. | |
2888605c JH |
462 | * We still need to refresh the index here. |
463 | */ | |
6654c889 | 464 | if (!only && !pathspec.nr) { |
07047d68 ÆAB |
465 | repo_hold_locked_index(the_repository, &index_lock, |
466 | LOCK_DIE_ON_ERROR); | |
d38a30df | 467 | refresh_cache_or_die(refresh_flags); |
dc594180 ÆAB |
468 | if (the_index.cache_changed |
469 | || !cache_tree_fully_valid(the_index.cache_tree)) | |
fcb864bc | 470 | cache_tree_update(&the_index, WRITE_TREE_SILENT); |
61000814 MÅ |
471 | if (write_locked_index(&the_index, &index_lock, |
472 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) | |
473 | die(_("unable to write new_index file")); | |
2888605c | 474 | commit_style = COMMIT_AS_IS; |
dd1055ed MÅ |
475 | ret = get_index_file(); |
476 | goto out; | |
f5bbc322 KH |
477 | } |
478 | ||
2888605c JH |
479 | /* |
480 | * A partial commit. | |
481 | * | |
482 | * (0) find the set of affected paths; | |
483 | * (1) get lock on the real index file; | |
484 | * (2) update the_index with the given paths; | |
485 | * (3) write the_index out to the real index (still locked); | |
486 | * (4) get lock on the false index file; | |
487 | * (5) reset the_index from HEAD; | |
488 | * (6) update the_index the same way as (2); | |
489 | * (7) write the_index out to the false index file; | |
490 | * (8) return the name of the false index file (still locked); | |
491 | * | |
492 | * The caller should run hooks on the locked false index, and | |
493 | * create commit from it. Then | |
494 | * (A) if all goes well, commit the real index; | |
495 | * (B) on failure, rollback the real index; | |
496 | * In either case, rollback the false index. | |
497 | */ | |
498 | commit_style = COMMIT_PARTIAL; | |
499 | ||
b0cea47e ÆAB |
500 | if (whence != FROM_COMMIT) { |
501 | if (whence == FROM_MERGE) | |
502 | die(_("cannot do a partial commit during a merge.")); | |
8d57f757 | 503 | else if (is_from_cherry_pick(whence)) |
b0cea47e | 504 | die(_("cannot do a partial commit during a cherry-pick.")); |
430b75f7 PW |
505 | else if (is_from_rebase(whence)) |
506 | die(_("cannot do a partial commit during a rebase.")); | |
b0cea47e | 507 | } |
2888605c | 508 | |
c5c33504 | 509 | if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec)) |
2888605c JH |
510 | exit(1); |
511 | ||
07047d68 ÆAB |
512 | discard_index(&the_index); |
513 | if (repo_read_index(the_repository) < 0) | |
8a6179bc | 514 | die(_("cannot read the index")); |
2888605c | 515 | |
07047d68 | 516 | repo_hold_locked_index(the_repository, &index_lock, LOCK_DIE_ON_ERROR); |
2888605c | 517 | add_remove_files(&partial); |
07047d68 | 518 | refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL); |
fcb864bc | 519 | cache_tree_update(&the_index, WRITE_TREE_SILENT); |
812d6b00 | 520 | if (write_locked_index(&the_index, &index_lock, 0)) |
8a6179bc | 521 | die(_("unable to write new_index file")); |
f5bbc322 | 522 | |
03b86647 NTND |
523 | hold_lock_file_for_update(&false_lock, |
524 | git_path("next-index-%"PRIuMAX, | |
525 | (uintmax_t) getpid()), | |
526 | LOCK_DIE_ON_ERROR); | |
fa9dcf80 | 527 | |
06bb643b | 528 | create_base_index(current_head); |
2888605c | 529 | add_remove_files(&partial); |
07047d68 | 530 | refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL); |
f5bbc322 | 531 | |
812d6b00 | 532 | if (write_locked_index(&the_index, &false_lock, 0)) |
8a6179bc | 533 | die(_("unable to write temporary index file")); |
959ba670 | 534 | |
07047d68 | 535 | discard_index(&the_index); |
b4fb09e4 | 536 | ret = get_lock_file_path(&false_lock); |
07047d68 | 537 | read_index_from(&the_index, ret, get_git_dir()); |
dd1055ed MÅ |
538 | out: |
539 | string_list_clear(&partial, 0); | |
540 | clear_pathspec(&pathspec); | |
b4fb09e4 | 541 | return ret; |
f5bbc322 KH |
542 | } |
543 | ||
d249b098 JH |
544 | static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn, |
545 | struct wt_status *s) | |
f5bbc322 | 546 | { |
8066df41 | 547 | struct object_id oid; |
76e2f7ce | 548 | |
d249b098 JH |
549 | if (s->relative_paths) |
550 | s->prefix = prefix; | |
f5bbc322 KH |
551 | |
552 | if (amend) { | |
d249b098 JH |
553 | s->amend = 1; |
554 | s->reference = "HEAD^1"; | |
f5bbc322 | 555 | } |
d249b098 JH |
556 | s->verbose = verbose; |
557 | s->index_file = index_file; | |
558 | s->fp = fp; | |
559 | s->nowarn = nowarn; | |
e82caf38 | 560 | s->is_initial = get_oid(s->reference, &oid) ? 1 : 0; |
d9fc746c | 561 | if (!s->is_initial) |
e0cb7cdb | 562 | oidcpy(&s->oid_commit, &oid); |
be7e795e JH |
563 | s->status_format = status_format; |
564 | s->ignore_submodule_arg = ignore_submodule_arg; | |
f5bbc322 | 565 | |
76e2f7ce | 566 | wt_status_collect(s); |
be7e795e | 567 | wt_status_print(s); |
73ba5d78 | 568 | wt_status_collect_free_buffers(s); |
f5bbc322 | 569 | |
6fa90194 | 570 | return s->committable; |
f5bbc322 KH |
571 | } |
572 | ||
06bb643b | 573 | static int is_a_merge(const struct commit *current_head) |
ec84bd00 | 574 | { |
06bb643b | 575 | return !!(current_head->parents && current_head->parents->next); |
ec84bd00 PB |
576 | } |
577 | ||
fac90838 JK |
578 | static void assert_split_ident(struct ident_split *id, const struct strbuf *buf) |
579 | { | |
c83a5099 | 580 | if (split_ident_line(id, buf->buf, buf->len) || !id->date_begin) |
033abf97 | 581 | BUG("unable to parse our own ident: %s", buf->buf); |
fac90838 JK |
582 | } |
583 | ||
7dfe8ad6 JH |
584 | static void export_one(const char *var, const char *s, const char *e, int hack) |
585 | { | |
586 | struct strbuf buf = STRBUF_INIT; | |
587 | if (hack) | |
588 | strbuf_addch(&buf, hack); | |
147ee355 | 589 | strbuf_add(&buf, s, e - s); |
7dfe8ad6 JH |
590 | setenv(var, buf.buf, 1); |
591 | strbuf_release(&buf); | |
592 | } | |
593 | ||
c33ddc2e | 594 | static int parse_force_date(const char *in, struct strbuf *out) |
14ac2864 | 595 | { |
c33ddc2e | 596 | strbuf_addch(out, '@'); |
14ac2864 | 597 | |
c33ddc2e | 598 | if (parse_date(in, out) < 0) { |
14ac2864 JK |
599 | int errors = 0; |
600 | unsigned long t = approxidate_careful(in, &errors); | |
601 | if (errors) | |
602 | return -1; | |
c33ddc2e | 603 | strbuf_addf(out, "%lu", t); |
14ac2864 JK |
604 | } |
605 | ||
606 | return 0; | |
607 | } | |
608 | ||
f4ef5173 JK |
609 | static void set_ident_var(char **buf, char *val) |
610 | { | |
611 | free(*buf); | |
612 | *buf = val; | |
613 | } | |
614 | ||
4c28e4ad | 615 | static void determine_author_info(struct strbuf *author_ident) |
a45d46ba SB |
616 | { |
617 | char *name, *email, *date; | |
7dfe8ad6 | 618 | struct ident_split author; |
a45d46ba | 619 | |
eaa541eb JK |
620 | name = xstrdup_or_null(getenv("GIT_AUTHOR_NAME")); |
621 | email = xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL")); | |
622 | date = xstrdup_or_null(getenv("GIT_AUTHOR_DATE")); | |
a45d46ba | 623 | |
37f7a857 | 624 | if (author_message) { |
f0f9662a | 625 | struct ident_split ident; |
2c733fb2 | 626 | size_t len; |
f0f9662a | 627 | const char *a; |
a45d46ba | 628 | |
f0f9662a | 629 | a = find_commit_header(author_message_buffer, "author", &len); |
a45d46ba | 630 | if (!a) |
f0f9662a JK |
631 | die(_("commit '%s' lacks author header"), author_message); |
632 | if (split_ident_line(&ident, a, len) < 0) | |
633 | die(_("commit '%s' has malformed author line"), author_message); | |
634 | ||
f4ef5173 JK |
635 | set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin)); |
636 | set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin)); | |
637 | ||
f0f9662a | 638 | if (ident.date_begin) { |
f4ef5173 | 639 | struct strbuf date_buf = STRBUF_INIT; |
f0f9662a JK |
640 | strbuf_addch(&date_buf, '@'); |
641 | strbuf_add(&date_buf, ident.date_begin, ident.date_end - ident.date_begin); | |
642 | strbuf_addch(&date_buf, ' '); | |
643 | strbuf_add(&date_buf, ident.tz_begin, ident.tz_end - ident.tz_begin); | |
f4ef5173 | 644 | set_ident_var(&date, strbuf_detach(&date_buf, NULL)); |
f0f9662a | 645 | } |
a45d46ba SB |
646 | } |
647 | ||
648 | if (force_author) { | |
f0f9662a | 649 | struct ident_split ident; |
a45d46ba | 650 | |
f0f9662a | 651 | if (split_ident_line(&ident, force_author, strlen(force_author)) < 0) |
8a6179bc | 652 | die(_("malformed --author parameter")); |
f4ef5173 JK |
653 | set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin)); |
654 | set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin)); | |
a45d46ba SB |
655 | } |
656 | ||
14ac2864 | 657 | if (force_date) { |
f4ef5173 | 658 | struct strbuf date_buf = STRBUF_INIT; |
c33ddc2e | 659 | if (parse_force_date(force_date, &date_buf)) |
14ac2864 | 660 | die(_("invalid date format: %s"), force_date); |
f4ef5173 | 661 | set_ident_var(&date, strbuf_detach(&date_buf, NULL)); |
14ac2864 JK |
662 | } |
663 | ||
39ab4d09 WH |
664 | strbuf_addstr(author_ident, fmt_ident(name, email, WANT_AUTHOR_IDENT, date, |
665 | IDENT_STRICT)); | |
c83a5099 JK |
666 | assert_split_ident(&author, author_ident); |
667 | export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0); | |
668 | export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0); | |
669 | export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@'); | |
f4ef5173 JK |
670 | free(name); |
671 | free(email); | |
672 | free(date); | |
a45d46ba SB |
673 | } |
674 | ||
b7242b8c JK |
675 | static int author_date_is_interesting(void) |
676 | { | |
677 | return author_message || force_date; | |
4c28e4ad JH |
678 | } |
679 | ||
84c9dc2c NTND |
680 | static void adjust_comment_line_char(const struct strbuf *sb) |
681 | { | |
682 | char candidates[] = "#;@!$%^&|:"; | |
683 | char *candidate; | |
684 | const char *p; | |
685 | ||
686 | comment_line_char = candidates[0]; | |
687 | if (!memchr(sb->buf, comment_line_char, sb->len)) | |
688 | return; | |
689 | ||
690 | p = sb->buf; | |
691 | candidate = strchr(candidates, *p); | |
692 | if (candidate) | |
693 | *candidate = ' '; | |
694 | for (p = sb->buf; *p; p++) { | |
695 | if ((p[0] == '\n' || p[0] == '\r') && p[1]) { | |
696 | candidate = strchr(candidates, p[1]); | |
697 | if (candidate) | |
698 | *candidate = ' '; | |
699 | } | |
700 | } | |
701 | ||
702 | for (p = candidates; *p == ' '; p++) | |
703 | ; | |
704 | if (!*p) | |
705 | die(_("unable to select a comment character that is not used\n" | |
706 | "in the current commit message")); | |
707 | comment_line_char = *p; | |
708 | } | |
709 | ||
494d314a CM |
710 | static void prepare_amend_commit(struct commit *commit, struct strbuf *sb, |
711 | struct pretty_print_context *ctx) | |
712 | { | |
713 | const char *buffer, *subject, *fmt; | |
714 | ||
715 | buffer = get_commit_buffer(commit, NULL); | |
716 | find_commit_subject(buffer, &subject); | |
717 | /* | |
718 | * If we amend the 'amend!' commit then we don't want to | |
719 | * duplicate the subject line. | |
720 | */ | |
721 | fmt = starts_with(subject, "amend!") ? "%b" : "%B"; | |
722 | format_commit_message(commit, fmt, sb, ctx); | |
723 | unuse_commit_buffer(commit, buffer); | |
724 | } | |
725 | ||
d249b098 | 726 | static int prepare_to_commit(const char *index_file, const char *prefix, |
06bb643b | 727 | struct commit *current_head, |
4c28e4ad JH |
728 | struct wt_status *s, |
729 | struct strbuf *author_ident) | |
f5bbc322 KH |
730 | { |
731 | struct stat statbuf; | |
4c28e4ad | 732 | struct strbuf committer_ident = STRBUF_INIT; |
6fa90194 | 733 | int committable; |
f285a2d7 | 734 | struct strbuf sb = STRBUF_INIT; |
8089c85b PB |
735 | const char *hook_arg1 = NULL; |
736 | const char *hook_arg2 = NULL; | |
d0aaa46f | 737 | int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE); |
2556b996 | 738 | int old_display_comment_prefix; |
1055997e | 739 | int merge_contains_scissors = 0; |
a8cc5943 | 740 | int invoked_hook; |
f5bbc322 | 741 | |
7dfe8ad6 JH |
742 | /* This checks and barfs if author is badly specified */ |
743 | determine_author_info(author_ident); | |
744 | ||
a8cc5943 ÆAB |
745 | if (!no_verify && run_commit_hook(use_editor, index_file, &invoked_hook, |
746 | "pre-commit", NULL)) | |
ec84bd00 | 747 | return 0; |
f5bbc322 | 748 | |
89ac1223 PN |
749 | if (squash_message) { |
750 | /* | |
751 | * Insert the proper subject line before other commit | |
752 | * message options add their content. | |
753 | */ | |
754 | if (use_message && !strcmp(use_message, squash_message)) | |
755 | strbuf_addstr(&sb, "squash! "); | |
756 | else { | |
757 | struct pretty_print_context ctx = {0}; | |
758 | struct commit *c; | |
759 | c = lookup_commit_reference_by_name(squash_message); | |
760 | if (!c) | |
8a6179bc | 761 | die(_("could not lookup commit %s"), squash_message); |
89ac1223 PN |
762 | ctx.output_encoding = get_commit_output_encoding(); |
763 | format_commit_message(c, "squash! %s\n\n", &sb, | |
764 | &ctx); | |
765 | } | |
766 | } | |
767 | ||
30884c9a | 768 | if (have_option_m && !fixup_message) { |
f9568530 | 769 | strbuf_addbuf(&sb, &message); |
8089c85b | 770 | hook_arg1 = "message"; |
f5bbc322 KH |
771 | } else if (logfile && !strcmp(logfile, "-")) { |
772 | if (isatty(0)) | |
8a6179bc | 773 | fprintf(stderr, _("(reading log message from standard input)\n")); |
f5bbc322 | 774 | if (strbuf_read(&sb, 0, 0) < 0) |
8a6179bc | 775 | die_errno(_("could not read log from standard input")); |
8089c85b | 776 | hook_arg1 = "message"; |
f5bbc322 KH |
777 | } else if (logfile) { |
778 | if (strbuf_read_file(&sb, logfile, 0) < 0) | |
8a6179bc | 779 | die_errno(_("could not read log file '%s'"), |
d824cbba | 780 | logfile); |
8089c85b | 781 | hook_arg1 = "message"; |
f5bbc322 | 782 | } else if (use_message) { |
e23fd15a | 783 | char *buffer; |
f5bbc322 | 784 | buffer = strstr(use_message_buffer, "\n\n"); |
076cbd63 | 785 | if (buffer) |
84e213a3 | 786 | strbuf_addstr(&sb, skip_blank_lines(buffer + 2)); |
8089c85b PB |
787 | hook_arg1 = "commit"; |
788 | hook_arg2 = use_message; | |
d71b8ba7 PN |
789 | } else if (fixup_message) { |
790 | struct pretty_print_context ctx = {0}; | |
791 | struct commit *commit; | |
494d314a CM |
792 | char *fmt; |
793 | commit = lookup_commit_reference_by_name(fixup_commit); | |
d71b8ba7 | 794 | if (!commit) |
494d314a | 795 | die(_("could not lookup commit %s"), fixup_commit); |
d71b8ba7 | 796 | ctx.output_encoding = get_commit_output_encoding(); |
494d314a CM |
797 | fmt = xstrfmt("%s! %%s\n\n", fixup_prefix); |
798 | format_commit_message(commit, fmt, &sb, &ctx); | |
799 | free(fmt); | |
d71b8ba7 | 800 | hook_arg1 = "message"; |
494d314a CM |
801 | |
802 | /* | |
803 | * Only `-m` commit message option is checked here, as | |
804 | * it supports `--fixup` to append the commit message. | |
805 | * | |
806 | * The other commit message options `-c`/`-C`/`-F` are | |
807 | * incompatible with all the forms of `--fixup` and | |
808 | * have already errored out while parsing the `git commit` | |
809 | * options. | |
810 | */ | |
811 | if (have_option_m && !strcmp(fixup_prefix, "fixup")) | |
812 | strbuf_addbuf(&sb, &message); | |
813 | ||
814 | if (!strcmp(fixup_prefix, "amend")) { | |
815 | if (have_option_m) | |
246cac85 | 816 | die(_("options '%s' and '%s:%s' cannot be used together"), "-m", "--fixup", fixup_message); |
494d314a CM |
817 | prepare_amend_commit(commit, &sb, &ctx); |
818 | } | |
102de880 | 819 | } else if (!stat(git_path_merge_msg(the_repository), &statbuf)) { |
1055997e DL |
820 | size_t merge_msg_start; |
821 | ||
b64c1e07 SS |
822 | /* |
823 | * prepend SQUASH_MSG here if it exists and a | |
824 | * "merge --squash" was originally performed | |
825 | */ | |
102de880 SB |
826 | if (!stat(git_path_squash_msg(the_repository), &statbuf)) { |
827 | if (strbuf_read_file(&sb, git_path_squash_msg(the_repository), 0) < 0) | |
b64c1e07 SS |
828 | die_errno(_("could not read SQUASH_MSG")); |
829 | hook_arg1 = "squash"; | |
830 | } else | |
831 | hook_arg1 = "merge"; | |
1055997e DL |
832 | |
833 | merge_msg_start = sb.len; | |
102de880 | 834 | if (strbuf_read_file(&sb, git_path_merge_msg(the_repository), 0) < 0) |
8a6179bc | 835 | die_errno(_("could not read MERGE_MSG")); |
1055997e DL |
836 | |
837 | if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS && | |
838 | wt_status_locate_end(sb.buf + merge_msg_start, | |
839 | sb.len - merge_msg_start) < | |
840 | sb.len - merge_msg_start) | |
841 | merge_contains_scissors = 1; | |
102de880 SB |
842 | } else if (!stat(git_path_squash_msg(the_repository), &statbuf)) { |
843 | if (strbuf_read_file(&sb, git_path_squash_msg(the_repository), 0) < 0) | |
8a6179bc | 844 | die_errno(_("could not read SQUASH_MSG")); |
8089c85b | 845 | hook_arg1 = "squash"; |
2140b140 | 846 | } else if (template_file) { |
f5bbc322 | 847 | if (strbuf_read_file(&sb, template_file, 0) < 0) |
8a6179bc | 848 | die_errno(_("could not read '%s'"), template_file); |
8089c85b | 849 | hook_arg1 = "template"; |
8b1ae678 | 850 | clean_message_contents = 0; |
f5bbc322 KH |
851 | } |
852 | ||
8089c85b | 853 | /* |
37f7a857 JS |
854 | * The remaining cases don't modify the template message, but |
855 | * just set the argument(s) to the prepare-commit-msg hook. | |
8089c85b | 856 | */ |
37f7a857 | 857 | else if (whence == FROM_MERGE) |
8089c85b | 858 | hook_arg1 = "merge"; |
430b75f7 | 859 | else if (is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) { |
37f7a857 JS |
860 | hook_arg1 = "commit"; |
861 | hook_arg2 = "CHERRY_PICK_HEAD"; | |
862 | } | |
8089c85b | 863 | |
89ac1223 PN |
864 | if (squash_message) { |
865 | /* | |
866 | * If squash_commit was used for the commit subject, | |
867 | * then we're possibly hijacking other commit log options. | |
868 | * Reset the hook args to tell the real story. | |
869 | */ | |
870 | hook_arg1 = "message"; | |
871 | hook_arg2 = ""; | |
872 | } | |
873 | ||
e51b0dfc | 874 | s->fp = fopen_for_writing(git_path_commit_editmsg()); |
afe8a907 | 875 | if (!s->fp) |
e51b0dfc | 876 | die_errno(_("could not open '%s'"), git_path_commit_editmsg()); |
f5bbc322 | 877 | |
2556b996 MM |
878 | /* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */ |
879 | old_display_comment_prefix = s->display_comment_prefix; | |
880 | s->display_comment_prefix = 1; | |
881 | ||
ea9882bf MM |
882 | /* |
883 | * Most hints are counter-productive when the commit has | |
884 | * already started. | |
885 | */ | |
886 | s->hints = 0; | |
887 | ||
8b1ae678 | 888 | if (clean_message_contents) |
63af4a84 | 889 | strbuf_stripspace(&sb, 0); |
f5bbc322 | 890 | |
073bd75e | 891 | if (signoff) |
710714aa | 892 | append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0); |
f5bbc322 | 893 | |
37f3012f | 894 | if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len) |
8a6179bc | 895 | die_errno(_("could not write commit template")); |
13208572 | 896 | |
84c9dc2c NTND |
897 | if (auto_comment_line_char) |
898 | adjust_comment_line_char(&sb); | |
f5bbc322 KH |
899 | strbuf_release(&sb); |
900 | ||
bb1ae3f6 | 901 | /* This checks if committer ident is explicitly given */ |
f20f3878 | 902 | strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT)); |
bed575e4 | 903 | if (use_editor && include_status) { |
e23fd15a EP |
904 | int ident_shown = 0; |
905 | int saved_color_setting; | |
47010263 | 906 | struct ident_split ci, ai; |
6f70f00b HJ |
907 | const char *hint_cleanup_all = allow_empty_message ? |
908 | _("Please enter the commit message for your changes." | |
909 | " Lines starting\nwith '%c' will be ignored.\n") : | |
910 | _("Please enter the commit message for your changes." | |
911 | " Lines starting\nwith '%c' will be ignored, and an empty" | |
912 | " message aborts the commit.\n"); | |
913 | const char *hint_cleanup_space = allow_empty_message ? | |
914 | _("Please enter the commit message for your changes." | |
915 | " Lines starting\n" | |
916 | "with '%c' will be kept; you may remove them" | |
917 | " yourself if you want to.\n") : | |
918 | _("Please enter the commit message for your changes." | |
919 | " Lines starting\n" | |
920 | "with '%c' will be kept; you may remove them" | |
921 | " yourself if you want to.\n" | |
922 | "An empty message aborts the commit.\n"); | |
75df1f43 | 923 | if (whence != FROM_COMMIT) { |
1055997e DL |
924 | if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS && |
925 | !merge_contains_scissors) | |
75df1f43 | 926 | wt_status_add_cut_line(s->fp); |
b6d2558c HWN |
927 | status_printf_ln( |
928 | s, GIT_COLOR_NORMAL, | |
ca03e067 | 929 | whence == FROM_MERGE ? |
b6d2558c HWN |
930 | _("\n" |
931 | "It looks like you may be committing a merge.\n" | |
932 | "If this is not correct, please run\n" | |
933 | " git update-ref -d MERGE_HEAD\n" | |
934 | "and try again.\n") : | |
935 | _("\n" | |
936 | "It looks like you may be committing a cherry-pick.\n" | |
937 | "If this is not correct, please run\n" | |
938 | " git update-ref -d CHERRY_PICK_HEAD\n" | |
939 | "and try again.\n")); | |
75df1f43 | 940 | } |
ec84bd00 | 941 | |
b926c0d1 | 942 | fprintf(s->fp, "\n"); |
d0aaa46f | 943 | if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL) |
54ba2f18 | 944 | status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_all, comment_line_char); |
1055997e DL |
945 | else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) { |
946 | if (whence == FROM_COMMIT && !merge_contains_scissors) | |
947 | wt_status_add_cut_line(s->fp); | |
948 | } else /* COMMIT_MSG_CLEANUP_SPACE, that is. */ | |
54ba2f18 | 949 | status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_space, comment_line_char); |
ec84bd00 | 950 | |
fac90838 JK |
951 | /* |
952 | * These should never fail because they come from our own | |
953 | * fmt_ident. They may fail the sane_ident test, but we know | |
954 | * that the name and mail pointers will at least be valid, | |
955 | * which is enough for our tests and printing here. | |
956 | */ | |
957 | assert_split_ident(&ai, author_ident); | |
958 | assert_split_ident(&ci, &committer_ident); | |
47010263 JK |
959 | |
960 | if (ident_cmp(&ai, &ci)) | |
b926c0d1 | 961 | status_printf_ln(s, GIT_COLOR_NORMAL, |
fe8165cd | 962 | _("%s" |
47010263 | 963 | "Author: %.*s <%.*s>"), |
b926c0d1 | 964 | ident_shown++ ? "" : "\n", |
47010263 JK |
965 | (int)(ai.name_end - ai.name_begin), ai.name_begin, |
966 | (int)(ai.mail_end - ai.mail_begin), ai.mail_begin); | |
e83dbe80 | 967 | |
b7242b8c JK |
968 | if (author_date_is_interesting()) |
969 | status_printf_ln(s, GIT_COLOR_NORMAL, | |
970 | _("%s" | |
971 | "Date: %s"), | |
972 | ident_shown++ ? "" : "\n", | |
a5481a6c | 973 | show_ident_date(&ai, DATE_MODE(NORMAL))); |
e83dbe80 | 974 | |
d6991cee | 975 | if (!committer_ident_sufficiently_given()) |
b926c0d1 | 976 | status_printf_ln(s, GIT_COLOR_NORMAL, |
fe8165cd | 977 | _("%s" |
47010263 | 978 | "Committer: %.*s <%.*s>"), |
b926c0d1 | 979 | ident_shown++ ? "" : "\n", |
47010263 JK |
980 | (int)(ci.name_end - ci.name_begin), ci.name_begin, |
981 | (int)(ci.mail_end - ci.mail_begin), ci.mail_begin); | |
bb1ae3f6 | 982 | |
b3cf1b77 | 983 | status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); /* Add new line for clarity */ |
bb1ae3f6 | 984 | |
d249b098 JH |
985 | saved_color_setting = s->use_color; |
986 | s->use_color = 0; | |
6fa90194 | 987 | committable = run_status(s->fp, index_file, prefix, 1, s); |
d249b098 | 988 | s->use_color = saved_color_setting; |
3e73cc62 | 989 | string_list_clear(&s->change, 1); |
ec84bd00 | 990 | } else { |
8066df41 | 991 | struct object_id oid; |
fbcf1184 | 992 | const char *parent = "HEAD"; |
7168624c | 993 | |
cec13b95 | 994 | if (!the_index.cache_nr) { |
03267e86 ÆAB |
995 | discard_cache(); |
996 | if (read_cache() < 0) | |
997 | die(_("Cannot read index")); | |
998 | } | |
7168624c | 999 | |
fbcf1184 JH |
1000 | if (amend) |
1001 | parent = "HEAD^1"; | |
1002 | ||
e82caf38 | 1003 | if (get_oid(parent, &oid)) { |
2c49f7ff NTND |
1004 | int i, ita_nr = 0; |
1005 | ||
cb8388df DS |
1006 | /* TODO: audit for interaction with sparse-index. */ |
1007 | ensure_full_index(&the_index); | |
dc594180 ÆAB |
1008 | for (i = 0; i < the_index.cache_nr; i++) |
1009 | if (ce_intent_to_add(the_index.cache[i])) | |
2c49f7ff | 1010 | ita_nr++; |
dc594180 | 1011 | committable = the_index.cache_nr - ita_nr > 0; |
2c49f7ff | 1012 | } else { |
c215d3d2 JL |
1013 | /* |
1014 | * Unless the user did explicitly request a submodule | |
1015 | * ignore mode by passing a command line option we do | |
1016 | * not ignore any changed submodule SHA-1s when | |
1017 | * comparing index and parent, no matter what is | |
1018 | * configured. Otherwise we won't commit any | |
1019 | * submodules which were manually staged, which would | |
1020 | * be really confusing. | |
1021 | */ | |
02f2f56b | 1022 | struct diff_flags flags = DIFF_FLAGS_INIT; |
0d1e0e78 | 1023 | flags.override_submodule_config = 1; |
c215d3d2 JL |
1024 | if (ignore_submodule_arg && |
1025 | !strcmp(ignore_submodule_arg, "all")) | |
0d1e0e78 | 1026 | flags.ignore_submodules = 1; |
ffc00a48 NTND |
1027 | committable = index_differs_from(the_repository, |
1028 | parent, &flags, 1); | |
c215d3d2 | 1029 | } |
ec84bd00 | 1030 | } |
4c28e4ad | 1031 | strbuf_release(&committer_ident); |
d616a239 | 1032 | |
37f3012f | 1033 | fclose(s->fp); |
7168624c | 1034 | |
2daae3d1 ZH |
1035 | if (trailer_args.nr) { |
1036 | struct child_process run_trailer = CHILD_PROCESS_INIT; | |
1037 | ||
1038 | strvec_pushl(&run_trailer.args, "interpret-trailers", | |
1039 | "--in-place", git_path_commit_editmsg(), NULL); | |
1040 | strvec_pushv(&run_trailer.args, trailer_args.v); | |
1041 | run_trailer.git_cmd = 1; | |
1042 | if (run_command(&run_trailer)) | |
1043 | die(_("unable to pass trailers to --trailers")); | |
1044 | strvec_clear(&trailer_args); | |
1045 | } | |
1046 | ||
37f7a857 JS |
1047 | /* |
1048 | * Reject an attempt to record a non-merge empty commit without | |
1049 | * explicit --allow-empty. In the cherry-pick case, it may be | |
1050 | * empty due to conflict resolution, which the user should okay. | |
1051 | */ | |
6fa90194 | 1052 | if (!committable && whence != FROM_MERGE && !allow_empty && |
06bb643b | 1053 | !(amend && is_a_merge(current_head))) { |
ed9bff08 | 1054 | s->hints = advice_enabled(ADVICE_STATUS_HINTS); |
2556b996 | 1055 | s->display_comment_prefix = old_display_comment_prefix; |
d249b098 | 1056 | run_status(stdout, index_file, prefix, 0, s); |
f197ed2f | 1057 | if (amend) |
fc88e316 | 1058 | fputs(_(empty_amend_advice), stderr); |
430b75f7 PW |
1059 | else if (is_from_cherry_pick(whence) || |
1060 | whence == FROM_REBASE_PICK) { | |
6c80cd29 | 1061 | fputs(_(empty_cherry_pick_advice), stderr); |
8d57f757 | 1062 | if (whence == FROM_CHERRY_PICK_SINGLE) |
c17592a7 | 1063 | fputs(_(empty_cherry_pick_advice_single), stderr); |
430b75f7 | 1064 | else if (whence == FROM_CHERRY_PICK_MULTI) |
c17592a7 | 1065 | fputs(_(empty_cherry_pick_advice_multi), stderr); |
430b75f7 PW |
1066 | else |
1067 | fputs(_(empty_rebase_pick_advice), stderr); | |
c17592a7 | 1068 | } |
ec84bd00 | 1069 | return 0; |
7168624c AR |
1070 | } |
1071 | ||
a8cc5943 | 1072 | if (!no_verify && invoked_hook) { |
680ee550 | 1073 | /* |
a8cc5943 ÆAB |
1074 | * Re-read the index as the pre-commit-commit hook was invoked |
1075 | * and could have updated it. We must do this before we invoke | |
680ee550 KW |
1076 | * the editor and after we invoke run_status above. |
1077 | */ | |
07047d68 | 1078 | discard_index(&the_index); |
680ee550 | 1079 | } |
07047d68 | 1080 | read_index_from(&the_index, index_file, get_git_dir()); |
680ee550 | 1081 | |
fcb864bc | 1082 | if (cache_tree_update(&the_index, 0)) { |
8a6179bc | 1083 | error(_("Error building trees")); |
ec84bd00 | 1084 | return 0; |
7168624c | 1085 | } |
f5bbc322 | 1086 | |
a8cc5943 | 1087 | if (run_commit_hook(use_editor, index_file, NULL, "prepare-commit-msg", |
e51b0dfc | 1088 | git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL)) |
8089c85b | 1089 | return 0; |
f5bbc322 | 1090 | |
ec84bd00 | 1091 | if (use_editor) { |
22f9b7f3 | 1092 | struct strvec env = STRVEC_INIT; |
8d7aa4ba | 1093 | |
22f9b7f3 | 1094 | strvec_pushf(&env, "GIT_INDEX_FILE=%s", index_file); |
d70a9eb6 | 1095 | if (launch_editor(git_path_commit_editmsg(), NULL, env.v)) { |
7198203a | 1096 | fprintf(stderr, |
8a6179bc | 1097 | _("Please supply the message using either -m or -F option.\n")); |
7198203a SB |
1098 | exit(1); |
1099 | } | |
22f9b7f3 | 1100 | strvec_clear(&env); |
ec84bd00 | 1101 | } |
f5bbc322 | 1102 | |
ec84bd00 | 1103 | if (!no_verify && |
a8cc5943 ÆAB |
1104 | run_commit_hook(use_editor, index_file, NULL, "commit-msg", |
1105 | git_path_commit_editmsg(), NULL)) { | |
ec84bd00 PB |
1106 | return 0; |
1107 | } | |
f5bbc322 | 1108 | |
ec84bd00 | 1109 | return 1; |
f5bbc322 KH |
1110 | } |
1111 | ||
146ea068 JH |
1112 | static const char *find_author_by_nickname(const char *name) |
1113 | { | |
1114 | struct rev_info revs; | |
1115 | struct commit *commit; | |
1116 | struct strbuf buf = STRBUF_INIT; | |
1117 | const char *av[20]; | |
1118 | int ac = 0; | |
1119 | ||
2abf3503 | 1120 | repo_init_revisions(the_repository, &revs, NULL); |
146ea068 JH |
1121 | strbuf_addf(&buf, "--author=%s", name); |
1122 | av[++ac] = "--all"; | |
1123 | av[++ac] = "-i"; | |
1124 | av[++ac] = buf.buf; | |
1125 | av[++ac] = NULL; | |
1126 | setup_revisions(ac, av, &revs, NULL); | |
a52f07af ÆAB |
1127 | revs.mailmap = xmalloc(sizeof(struct string_list)); |
1128 | string_list_init_nodup(revs.mailmap); | |
4e168333 | 1129 | read_mailmap(revs.mailmap); |
ea16794e | 1130 | |
81c3ce3c SB |
1131 | if (prepare_revision_walk(&revs)) |
1132 | die(_("revision walk setup failed")); | |
146ea068 JH |
1133 | commit = get_revision(&revs); |
1134 | if (commit) { | |
dd2e794a | 1135 | struct pretty_print_context ctx = {0}; |
a5481a6c | 1136 | ctx.date_mode.type = DATE_NORMAL; |
146ea068 | 1137 | strbuf_release(&buf); |
ea16794e | 1138 | format_commit_message(commit, "%aN <%aE>", &buf, &ctx); |
2108fe4a | 1139 | release_revisions(&revs); |
146ea068 JH |
1140 | return strbuf_detach(&buf, NULL); |
1141 | } | |
1044b1f6 | 1142 | die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name); |
146ea068 JH |
1143 | } |
1144 | ||
eec0f7f2 JM |
1145 | static void handle_ignored_arg(struct wt_status *s) |
1146 | { | |
1147 | if (!ignored_arg) | |
1148 | ; /* default already initialized */ | |
1149 | else if (!strcmp(ignored_arg, "traditional")) | |
1150 | s->show_ignored_mode = SHOW_TRADITIONAL_IGNORED; | |
1151 | else if (!strcmp(ignored_arg, "no")) | |
1152 | s->show_ignored_mode = SHOW_NO_IGNORED; | |
1153 | else if (!strcmp(ignored_arg, "matching")) | |
1154 | s->show_ignored_mode = SHOW_MATCHING_IGNORED; | |
1155 | else | |
1156 | die(_("Invalid ignored mode '%s'"), ignored_arg); | |
1157 | } | |
76e2f7ce JH |
1158 | |
1159 | static void handle_untracked_files_arg(struct wt_status *s) | |
1160 | { | |
1161 | if (!untracked_files_arg) | |
1162 | ; /* default already initialized */ | |
1163 | else if (!strcmp(untracked_files_arg, "no")) | |
1164 | s->show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
1165 | else if (!strcmp(untracked_files_arg, "normal")) | |
1166 | s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
1167 | else if (!strcmp(untracked_files_arg, "all")) | |
1168 | s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
5a59a230 NTND |
1169 | /* |
1170 | * Please update $__git_untracked_file_modes in | |
1171 | * git-completion.bash when you add new options | |
1172 | */ | |
76e2f7ce | 1173 | else |
8a6179bc | 1174 | die(_("Invalid untracked files mode '%s'"), untracked_files_arg); |
76e2f7ce JH |
1175 | } |
1176 | ||
37f7a857 JS |
1177 | static const char *read_commit_message(const char *name) |
1178 | { | |
dd0d388c | 1179 | const char *out_enc; |
37f7a857 JS |
1180 | struct commit *commit; |
1181 | ||
1182 | commit = lookup_commit_reference_by_name(name); | |
1183 | if (!commit) | |
6c80cd29 | 1184 | die(_("could not lookup commit %s"), name); |
37f7a857 | 1185 | out_enc = get_commit_output_encoding(); |
5a10d236 | 1186 | return logmsg_reencode(commit, NULL, out_enc); |
37f7a857 JS |
1187 | } |
1188 | ||
84b4202d JH |
1189 | /* |
1190 | * Enumerate what needs to be propagated when --porcelain | |
1191 | * is not in effect here. | |
1192 | */ | |
1193 | static struct status_deferred_config { | |
be7e795e | 1194 | enum wt_status_format status_format; |
84b4202d | 1195 | int show_branch; |
06b324c1 | 1196 | enum ahead_behind_flags ahead_behind; |
84b4202d JH |
1197 | } status_deferred_config = { |
1198 | STATUS_FORMAT_UNSPECIFIED, | |
06b324c1 JH |
1199 | -1, /* unspecified */ |
1200 | AHEAD_BEHIND_UNSPECIFIED, | |
84b4202d JH |
1201 | }; |
1202 | ||
1203 | static void finalize_deferred_config(struct wt_status *s) | |
1204 | { | |
1205 | int use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN && | |
1ecdecce | 1206 | status_format != STATUS_FORMAT_PORCELAIN_V2 && |
84b4202d JH |
1207 | !s->null_termination); |
1208 | ||
1209 | if (s->null_termination) { | |
1210 | if (status_format == STATUS_FORMAT_NONE || | |
1211 | status_format == STATUS_FORMAT_UNSPECIFIED) | |
1212 | status_format = STATUS_FORMAT_PORCELAIN; | |
1213 | else if (status_format == STATUS_FORMAT_LONG) | |
12909b6b | 1214 | die(_("options '%s' and '%s' cannot be used together"), "--long", "-z"); |
84b4202d JH |
1215 | } |
1216 | ||
1217 | if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED) | |
1218 | status_format = status_deferred_config.status_format; | |
1219 | if (status_format == STATUS_FORMAT_UNSPECIFIED) | |
1220 | status_format = STATUS_FORMAT_NONE; | |
1221 | ||
1222 | if (use_deferred_config && s->show_branch < 0) | |
1223 | s->show_branch = status_deferred_config.show_branch; | |
1224 | if (s->show_branch < 0) | |
1225 | s->show_branch = 0; | |
fd9b544a | 1226 | |
06b324c1 JH |
1227 | /* |
1228 | * If the user did not give a "--[no]-ahead-behind" command | |
fb4db1a2 JH |
1229 | * line argument *AND* we will print in a human-readable format |
1230 | * (short, long etc.) then we inherit from the status.aheadbehind | |
1231 | * config setting. In all other cases (and porcelain V[12] formats | |
1232 | * in particular), we inherit _FULL for backwards compatibility. | |
06b324c1 | 1233 | */ |
fb4db1a2 JH |
1234 | if (use_deferred_config && |
1235 | s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) | |
06b324c1 JH |
1236 | s->ahead_behind_flags = status_deferred_config.ahead_behind; |
1237 | ||
fd9b544a JH |
1238 | if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED) |
1239 | s->ahead_behind_flags = AHEAD_BEHIND_FULL; | |
84b4202d JH |
1240 | } |
1241 | ||
3270ae82 CM |
1242 | static void check_fixup_reword_options(int argc, const char *argv[]) { |
1243 | if (whence != FROM_COMMIT) { | |
1244 | if (whence == FROM_MERGE) | |
1245 | die(_("You are in the middle of a merge -- cannot reword.")); | |
1246 | else if (is_from_cherry_pick(whence)) | |
1247 | die(_("You are in the middle of a cherry-pick -- cannot reword.")); | |
1248 | } | |
1249 | if (argc) | |
246cac85 | 1250 | die(_("reword option of '%s' and path '%s' cannot be used together"), "--fixup", *argv); |
3270ae82 | 1251 | if (patch_interactive || interactive || all || also || only) |
246cac85 JNA |
1252 | die(_("reword option of '%s' and '%s' cannot be used together"), |
1253 | "--fixup", "--patch/--interactive/--all/--include/--only"); | |
3270ae82 CM |
1254 | } |
1255 | ||
2f02b25f | 1256 | static int parse_and_validate_options(int argc, const char *argv[], |
036dbbfb | 1257 | const struct option *options, |
dbd0f5c7 | 1258 | const char * const usage[], |
d249b098 | 1259 | const char *prefix, |
06bb643b | 1260 | struct commit *current_head, |
d249b098 | 1261 | struct wt_status *s) |
f5bbc322 | 1262 | { |
036dbbfb | 1263 | argc = parse_options(argc, argv, prefix, options, usage, 0); |
84b4202d | 1264 | finalize_deferred_config(s); |
f5bbc322 | 1265 | |
146ea068 JH |
1266 | if (force_author && !strchr(force_author, '>')) |
1267 | force_author = find_author_by_nickname(force_author); | |
1268 | ||
c51f6cee | 1269 | if (force_author && renew_authorship) |
a699367b | 1270 | die(_("options '%s' and '%s' cannot be used together"), "--reset-author", "--author"); |
c51f6cee | 1271 | |
494d314a | 1272 | if (logfile || have_option_m || use_message) |
4803466f | 1273 | use_editor = 0; |
f5bbc322 | 1274 | |
f5bbc322 | 1275 | /* Sanity check options */ |
06bb643b | 1276 | if (amend && !current_head) |
8a6179bc | 1277 | die(_("You have nothing to amend.")); |
b0cea47e ÆAB |
1278 | if (amend && whence != FROM_COMMIT) { |
1279 | if (whence == FROM_MERGE) | |
1280 | die(_("You are in the middle of a merge -- cannot amend.")); | |
8d57f757 | 1281 | else if (is_from_cherry_pick(whence)) |
b0cea47e | 1282 | die(_("You are in the middle of a cherry-pick -- cannot amend.")); |
430b75f7 PW |
1283 | else if (whence == FROM_REBASE_PICK) |
1284 | die(_("You are in the middle of a rebase -- cannot amend.")); | |
b0cea47e | 1285 | } |
89ac1223 | 1286 | if (fixup_message && squash_message) |
a699367b JNA |
1287 | die(_("options '%s' and '%s' cannot be used together"), "--squash", "--fixup"); |
1288 | die_for_incompatible_opt4(!!use_message, "-C", | |
1289 | !!edit_message, "-c", | |
1290 | !!logfile, "-F", | |
1291 | !!fixup_message, "--fixup"); | |
1292 | die_for_incompatible_opt4(have_option_m, "-m", | |
1293 | !!edit_message, "-c", | |
1294 | !!use_message, "-C", | |
1295 | !!logfile, "-F"); | |
1296 | if (use_message || edit_message || logfile ||fixup_message || have_option_m) | |
010c7dbc | 1297 | template_file = NULL; |
f5bbc322 KH |
1298 | if (edit_message) |
1299 | use_message = edit_message; | |
d71b8ba7 | 1300 | if (amend && !use_message && !fixup_message) |
f5bbc322 | 1301 | use_message = "HEAD"; |
430b75f7 PW |
1302 | if (!use_message && !is_from_cherry_pick(whence) && |
1303 | !is_from_rebase(whence) && renew_authorship) | |
8a6179bc | 1304 | die(_("--reset-author can be used only with -C, -c or --amend.")); |
f5bbc322 | 1305 | if (use_message) { |
37f7a857 JS |
1306 | use_message_buffer = read_commit_message(use_message); |
1307 | if (!renew_authorship) { | |
1308 | author_message = use_message; | |
1309 | author_message_buffer = use_message_buffer; | |
1310 | } | |
1311 | } | |
430b75f7 PW |
1312 | if ((is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) && |
1313 | !renew_authorship) { | |
37f7a857 JS |
1314 | author_message = "CHERRY_PICK_HEAD"; |
1315 | author_message_buffer = read_commit_message(author_message); | |
f5bbc322 KH |
1316 | } |
1317 | ||
b4bd4668 CI |
1318 | if (patch_interactive) |
1319 | interactive = 1; | |
1320 | ||
a699367b JNA |
1321 | die_for_incompatible_opt4(also, "-i/--include", |
1322 | only, "-o/--only", | |
1323 | all, "-a/--all", | |
1324 | interactive, "--interactive/-p/--patch"); | |
494d314a CM |
1325 | if (fixup_message) { |
1326 | /* | |
1327 | * We limit --fixup's suboptions to only alpha characters. | |
1328 | * If the first character after a run of alpha is colon, | |
1329 | * then the part before the colon may be a known suboption | |
3270ae82 CM |
1330 | * name like `amend` or `reword`, or a misspelt suboption |
1331 | * name. In either case, we treat it as | |
1332 | * --fixup=<suboption>:<arg>. | |
494d314a CM |
1333 | * |
1334 | * Otherwise, we are dealing with --fixup=<commit>. | |
1335 | */ | |
1336 | char *p = fixup_message; | |
1337 | while (isalpha(*p)) | |
1338 | p++; | |
1339 | if (p > fixup_message && *p == ':') { | |
1340 | *p = '\0'; | |
1341 | fixup_commit = p + 1; | |
3270ae82 CM |
1342 | if (!strcmp("amend", fixup_message) || |
1343 | !strcmp("reword", fixup_message)) { | |
494d314a CM |
1344 | fixup_prefix = "amend"; |
1345 | allow_empty = 1; | |
3270ae82 CM |
1346 | if (*fixup_message == 'r') { |
1347 | check_fixup_reword_options(argc, argv); | |
1348 | only = 1; | |
1349 | } | |
494d314a CM |
1350 | } else { |
1351 | die(_("unknown option: --fixup=%s:%s"), fixup_message, fixup_commit); | |
1352 | } | |
1353 | } else { | |
1354 | fixup_commit = fixup_message; | |
1355 | fixup_prefix = "fixup"; | |
1356 | use_editor = 0; | |
1357 | } | |
1358 | } | |
1359 | ||
8ef6aad6 JK |
1360 | if (0 <= edit_flag) |
1361 | use_editor = edit_flag; | |
1362 | ||
f29cd862 | 1363 | cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor); |
f5bbc322 | 1364 | |
76e2f7ce | 1365 | handle_untracked_files_arg(s); |
4bfee30a | 1366 | |
f5bbc322 | 1367 | if (all && argc > 0) |
5a1dbd48 NTND |
1368 | die(_("paths '%s ...' with -a does not make sense"), |
1369 | argv[0]); | |
f5bbc322 | 1370 | |
f3f47a1e | 1371 | if (status_format != STATUS_FORMAT_NONE) |
7c9f7038 JK |
1372 | dry_run = 1; |
1373 | ||
f5bbc322 KH |
1374 | return argc; |
1375 | } | |
1376 | ||
e885a84f | 1377 | static int dry_run_commit(const char **argv, const char *prefix, |
06bb643b | 1378 | const struct commit *current_head, struct wt_status *s) |
f5bbc322 | 1379 | { |
6fa90194 | 1380 | int committable; |
3a5d13a3 | 1381 | const char *index_file; |
f5bbc322 | 1382 | |
e885a84f | 1383 | index_file = prepare_index(argv, prefix, current_head, 1); |
6fa90194 | 1384 | committable = run_status(stdout, index_file, prefix, 0, s); |
3a5d13a3 | 1385 | rollback_index_files(); |
f5bbc322 | 1386 | |
6fa90194 | 1387 | return committable ? 0 : 1; |
3a5d13a3 JH |
1388 | } |
1389 | ||
3ac68a93 NTND |
1390 | define_list_config_array_extra(color_status_slots, {"added"}); |
1391 | ||
8852117a | 1392 | static int parse_status_slot(const char *slot) |
f766b367 | 1393 | { |
a73b3680 | 1394 | if (!strcasecmp(slot, "added")) |
f766b367 | 1395 | return WT_STATUS_UPDATED; |
a73b3680 NTND |
1396 | |
1397 | return LOOKUP_CONFIG(color_status_slots, slot); | |
f766b367 JH |
1398 | } |
1399 | ||
1400 | static int git_status_config(const char *k, const char *v, void *cb) | |
1401 | { | |
1402 | struct wt_status *s = cb; | |
e3f1da98 | 1403 | const char *slot_name; |
f766b367 | 1404 | |
59556548 | 1405 | if (starts_with(k, "column.")) |
4d2292e9 | 1406 | return git_column_config(k, v, "status", &s->colopts); |
f766b367 JH |
1407 | if (!strcmp(k, "status.submodulesummary")) { |
1408 | int is_bool; | |
1409 | s->submodule_summary = git_config_bool_or_int(k, v, &is_bool); | |
1410 | if (is_bool && s->submodule_summary) | |
1411 | s->submodule_summary = -1; | |
1412 | return 0; | |
1413 | } | |
4fb5166a JJGG |
1414 | if (!strcmp(k, "status.short")) { |
1415 | if (git_config_bool(k, v)) | |
84b4202d | 1416 | status_deferred_config.status_format = STATUS_FORMAT_SHORT; |
4fb5166a | 1417 | else |
84b4202d | 1418 | status_deferred_config.status_format = STATUS_FORMAT_NONE; |
4fb5166a JJGG |
1419 | return 0; |
1420 | } | |
ec85d070 | 1421 | if (!strcmp(k, "status.branch")) { |
84b4202d | 1422 | status_deferred_config.show_branch = git_config_bool(k, v); |
ec85d070 JJGG |
1423 | return 0; |
1424 | } | |
06b324c1 JH |
1425 | if (!strcmp(k, "status.aheadbehind")) { |
1426 | status_deferred_config.ahead_behind = git_config_bool(k, v); | |
1427 | return 0; | |
1428 | } | |
c1b5d019 LB |
1429 | if (!strcmp(k, "status.showstash")) { |
1430 | s->show_stash = git_config_bool(k, v); | |
1431 | return 0; | |
1432 | } | |
f766b367 | 1433 | if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { |
e269eb79 | 1434 | s->use_color = git_config_colorbool(k, v); |
f766b367 JH |
1435 | return 0; |
1436 | } | |
2556b996 MM |
1437 | if (!strcmp(k, "status.displaycommentprefix")) { |
1438 | s->display_comment_prefix = git_config_bool(k, v); | |
1439 | return 0; | |
1440 | } | |
e3f1da98 RS |
1441 | if (skip_prefix(k, "status.color.", &slot_name) || |
1442 | skip_prefix(k, "color.status.", &slot_name)) { | |
b9465768 | 1443 | int slot = parse_status_slot(slot_name); |
8b8e8624 JK |
1444 | if (slot < 0) |
1445 | return 0; | |
f766b367 JH |
1446 | if (!v) |
1447 | return config_error_nonbool(k); | |
f6c5a296 | 1448 | return color_parse(v, s->color_palette[slot]); |
f766b367 JH |
1449 | } |
1450 | if (!strcmp(k, "status.relativepaths")) { | |
1451 | s->relative_paths = git_config_bool(k, v); | |
1452 | return 0; | |
1453 | } | |
1454 | if (!strcmp(k, "status.showuntrackedfiles")) { | |
1455 | if (!v) | |
1456 | return config_error_nonbool(k); | |
1457 | else if (!strcmp(v, "no")) | |
1458 | s->show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
1459 | else if (!strcmp(v, "normal")) | |
1460 | s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
1461 | else if (!strcmp(v, "all")) | |
1462 | s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
1463 | else | |
8a6179bc | 1464 | return error(_("Invalid untracked files mode '%s'"), v); |
f766b367 JH |
1465 | return 0; |
1466 | } | |
e8b2dc2c BP |
1467 | if (!strcmp(k, "diff.renamelimit")) { |
1468 | if (s->rename_limit == -1) | |
1469 | s->rename_limit = git_config_int(k, v); | |
1470 | return 0; | |
1471 | } | |
1472 | if (!strcmp(k, "status.renamelimit")) { | |
1473 | s->rename_limit = git_config_int(k, v); | |
1474 | return 0; | |
1475 | } | |
1476 | if (!strcmp(k, "diff.renames")) { | |
1477 | if (s->detect_rename == -1) | |
1478 | s->detect_rename = git_config_rename(k, v); | |
1479 | return 0; | |
1480 | } | |
1481 | if (!strcmp(k, "status.renames")) { | |
1482 | s->detect_rename = git_config_rename(k, v); | |
1483 | return 0; | |
1484 | } | |
f766b367 JH |
1485 | return git_diff_ui_config(k, v, NULL); |
1486 | } | |
1487 | ||
3a5d13a3 JH |
1488 | int cmd_status(int argc, const char **argv, const char *prefix) |
1489 | { | |
e8b2dc2c BP |
1490 | static int no_renames = -1; |
1491 | static const char *rename_score_arg = (const char *)-1; | |
036dbbfb | 1492 | static struct wt_status s; |
ae9af122 | 1493 | unsigned int progress_flag = 0; |
4bb6644d | 1494 | int fd; |
8066df41 | 1495 | struct object_id oid; |
9e4b7ab6 | 1496 | static struct option builtin_status_options[] = { |
f2276316 | 1497 | OPT__VERBOSE(&verbose, N_("be verbose")), |
dd2be243 | 1498 | OPT_SET_INT('s', "short", &status_format, |
f2276316 | 1499 | N_("show status concisely"), STATUS_FORMAT_SHORT), |
84b4202d JH |
1500 | OPT_BOOL('b', "branch", &s.show_branch, |
1501 | N_("show branch information")), | |
c1b5d019 LB |
1502 | OPT_BOOL(0, "show-stash", &s.show_stash, |
1503 | N_("show stash information")), | |
fd9b544a JH |
1504 | OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags, |
1505 | N_("compute full ahead/behind values")), | |
203c8533 | 1506 | OPT_CALLBACK_F(0, "porcelain", &status_format, |
c4f596b9 | 1507 | N_("version"), N_("machine-readable output"), |
203c8533 | 1508 | PARSE_OPT_OPTARG, opt_parse_porcelain), |
f3f47a1e JK |
1509 | OPT_SET_INT(0, "long", &status_format, |
1510 | N_("show status in long format (default)"), | |
1511 | STATUS_FORMAT_LONG), | |
d5d09d47 SB |
1512 | OPT_BOOL('z', "null", &s.null_termination, |
1513 | N_("terminate entries with NUL")), | |
76e2f7ce | 1514 | { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, |
f2276316 NTND |
1515 | N_("mode"), |
1516 | N_("show untracked files, optional modes: all, normal, no. (Default: all)"), | |
76e2f7ce | 1517 | PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
eec0f7f2 JM |
1518 | { OPTION_STRING, 0, "ignored", &ignored_arg, |
1519 | N_("mode"), | |
1520 | N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"), | |
1521 | PARSE_OPT_OPTARG, NULL, (intptr_t)"traditional" }, | |
f2276316 NTND |
1522 | { OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"), |
1523 | N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"), | |
46a958b3 | 1524 | PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
9c23f4c5 | 1525 | OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")), |
e8b2dc2c | 1526 | OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")), |
203c8533 | 1527 | OPT_CALLBACK_F('M', "find-renames", &rename_score_arg, |
e8b2dc2c | 1528 | N_("n"), N_("detect renames, optionally set similarity index"), |
203c8533 | 1529 | PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score), |
76e2f7ce JH |
1530 | OPT_END(), |
1531 | }; | |
1532 | ||
5d3dd915 NTND |
1533 | if (argc == 2 && !strcmp(argv[1], "-h")) |
1534 | usage_with_options(builtin_status_usage, builtin_status_options); | |
1535 | ||
d76723ee DS |
1536 | prepare_repo_settings(the_repository); |
1537 | the_repository->settings.command_requires_full_index = 0; | |
1538 | ||
5c25dfaa | 1539 | status_init_config(&s, git_status_config); |
76e2f7ce | 1540 | argc = parse_options(argc, argv, prefix, |
9e4b7ab6 JH |
1541 | builtin_status_options, |
1542 | builtin_status_usage, 0); | |
4d2292e9 | 1543 | finalize_colopts(&s.colopts, -1); |
84b4202d | 1544 | finalize_deferred_config(&s); |
000f97bd | 1545 | |
76e2f7ce | 1546 | handle_untracked_files_arg(&s); |
eec0f7f2 JM |
1547 | handle_ignored_arg(&s); |
1548 | ||
1549 | if (s.show_ignored_mode == SHOW_MATCHING_IGNORED && | |
1550 | s.show_untracked_files == SHOW_NO_UNTRACKED_FILES) | |
1551 | die(_("Unsupported combination of ignored and untracked-files arguments")); | |
1552 | ||
15b55ae0 NTND |
1553 | parse_pathspec(&s.pathspec, 0, |
1554 | PATHSPEC_PREFER_FULL, | |
1555 | prefix, argv); | |
76e2f7ce | 1556 | |
ae9af122 NTND |
1557 | if (status_format != STATUS_FORMAT_PORCELAIN && |
1558 | status_format != STATUS_FORMAT_PORCELAIN_V2) | |
1559 | progress_flag = REFRESH_PROGRESS; | |
e1ff0a32 | 1560 | repo_read_index(the_repository); |
ae9af122 NTND |
1561 | refresh_index(&the_index, |
1562 | REFRESH_QUIET|REFRESH_UNMERGED|progress_flag, | |
1563 | &s.pathspec, NULL, NULL); | |
4bb6644d | 1564 | |
27344d6a | 1565 | if (use_optional_locks()) |
07047d68 | 1566 | fd = repo_hold_locked_index(the_repository, &index_lock, 0); |
27344d6a JK |
1567 | else |
1568 | fd = -1; | |
4bb6644d | 1569 | |
e82caf38 | 1570 | s.is_initial = get_oid(s.reference, &oid) ? 1 : 0; |
d9fc746c | 1571 | if (!s.is_initial) |
e0cb7cdb | 1572 | oidcpy(&s.oid_commit, &oid); |
d9fc746c | 1573 | |
46a958b3 | 1574 | s.ignore_submodule_arg = ignore_submodule_arg; |
be7e795e JH |
1575 | s.status_format = status_format; |
1576 | s.verbose = verbose; | |
e8b2dc2c BP |
1577 | if (no_renames != -1) |
1578 | s.detect_rename = !no_renames; | |
1579 | if ((intptr_t)rename_score_arg != -1) { | |
1580 | if (s.detect_rename < DIFF_DETECT_RENAME) | |
1581 | s.detect_rename = DIFF_DETECT_RENAME; | |
1582 | if (rename_score_arg) | |
1583 | s.rename_score = parse_rename_score(&rename_score_arg); | |
1584 | } | |
be7e795e | 1585 | |
76e2f7ce JH |
1586 | wt_status_collect(&s); |
1587 | ||
226c051a | 1588 | if (0 <= fd) |
1b0d968b | 1589 | repo_update_index_if_able(the_repository, &index_lock); |
226c051a | 1590 | |
8661768f JK |
1591 | if (s.relative_paths) |
1592 | s.prefix = prefix; | |
38920dd6 | 1593 | |
be7e795e | 1594 | wt_status_print(&s); |
73ba5d78 SS |
1595 | wt_status_collect_free_buffers(&s); |
1596 | ||
76e2f7ce | 1597 | return 0; |
f5bbc322 KH |
1598 | } |
1599 | ||
186458b1 | 1600 | static int git_commit_config(const char *k, const char *v, void *cb) |
f5bbc322 | 1601 | { |
d249b098 | 1602 | struct wt_status *s = cb; |
ba3c69a9 | 1603 | int status; |
d249b098 | 1604 | |
984c6e7e | 1605 | if (!strcmp(k, "commit.template")) |
395de250 | 1606 | return git_config_pathname(&template_file, k, v); |
bed575e4 JHI |
1607 | if (!strcmp(k, "commit.status")) { |
1608 | include_status = git_config_bool(k, v); | |
1609 | return 0; | |
1610 | } | |
51fb3a3d RT |
1611 | if (!strcmp(k, "commit.cleanup")) |
1612 | return git_config_string(&cleanup_arg, k, v); | |
d95bfb12 NV |
1613 | if (!strcmp(k, "commit.gpgsign")) { |
1614 | sign_commit = git_config_bool(k, v) ? "" : NULL; | |
1615 | return 0; | |
1616 | } | |
aaab8420 PB |
1617 | if (!strcmp(k, "commit.verbose")) { |
1618 | int is_bool; | |
1619 | config_commit_verbose = git_config_bool_or_int(k, v, &is_bool); | |
1620 | return 0; | |
1621 | } | |
f5bbc322 | 1622 | |
ba3c69a9 JH |
1623 | status = git_gpg_config(k, v, NULL); |
1624 | if (status) | |
1625 | return status; | |
d249b098 | 1626 | return git_status_config(k, v, s); |
f5bbc322 KH |
1627 | } |
1628 | ||
f5bbc322 KH |
1629 | int cmd_commit(int argc, const char **argv, const char *prefix) |
1630 | { | |
036dbbfb JK |
1631 | static struct wt_status s; |
1632 | static struct option builtin_commit_options[] = { | |
9c23f4c5 NTND |
1633 | OPT__QUIET(&quiet, N_("suppress summary after successful commit")), |
1634 | OPT__VERBOSE(&verbose, N_("show diff in commit message template")), | |
1635 | ||
1636 | OPT_GROUP(N_("Commit message options")), | |
1637 | OPT_FILENAME('F', "file", &logfile, N_("read message from file")), | |
1638 | OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")), | |
1639 | OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")), | |
1640 | OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m), | |
1641 | OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")), | |
1642 | OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")), | |
494d314a | 1643 | /* |
3270ae82 CM |
1644 | * TRANSLATORS: Leave "[(amend|reword):]" as-is, |
1645 | * and only translate <commit>. | |
494d314a | 1646 | */ |
3270ae82 | 1647 | OPT_STRING(0, "fixup", &fixup_message, N_("[(amend|reword):]commit"), N_("use autosquash formatted message to fixup or amend/reword specified commit")), |
9c23f4c5 | 1648 | OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")), |
d5d09d47 | 1649 | OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")), |
116761ba | 1650 | OPT_CALLBACK_F(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG, opt_pass_trailer), |
3abd4a67 | 1651 | OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")), |
9c23f4c5 NTND |
1652 | OPT_FILENAME('t', "template", &template_file, N_("use specified template file")), |
1653 | OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")), | |
ca04dc96 | 1654 | OPT_CLEANUP(&cleanup_arg), |
d5d09d47 | 1655 | OPT_BOOL(0, "status", &include_status, N_("include status in commit message template")), |
e703d711 | 1656 | { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"), |
9c23f4c5 | 1657 | N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, |
036dbbfb JK |
1658 | /* end commit message options */ |
1659 | ||
9c23f4c5 | 1660 | OPT_GROUP(N_("Commit contents options")), |
d5d09d47 SB |
1661 | OPT_BOOL('a', "all", &all, N_("commit all changed files")), |
1662 | OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")), | |
1663 | OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")), | |
1664 | OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")), | |
1665 | OPT_BOOL('o', "only", &only, N_("commit only specified files")), | |
def480fe | 1666 | OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")), |
d5d09d47 | 1667 | OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")), |
9c23f4c5 | 1668 | OPT_SET_INT(0, "short", &status_format, N_("show status concisely"), |
036dbbfb | 1669 | STATUS_FORMAT_SHORT), |
84b4202d | 1670 | OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")), |
fd9b544a JH |
1671 | OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags, |
1672 | N_("compute full ahead/behind values")), | |
036dbbfb | 1673 | OPT_SET_INT(0, "porcelain", &status_format, |
9c23f4c5 | 1674 | N_("machine-readable output"), STATUS_FORMAT_PORCELAIN), |
f3f47a1e JK |
1675 | OPT_SET_INT(0, "long", &status_format, |
1676 | N_("show status in long format (default)"), | |
1677 | STATUS_FORMAT_LONG), | |
d5d09d47 SB |
1678 | OPT_BOOL('z', "null", &s.null_termination, |
1679 | N_("terminate entries with NUL")), | |
1680 | OPT_BOOL(0, "amend", &amend, N_("amend previous commit")), | |
1681 | OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")), | |
9c23f4c5 | 1682 | { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
e440fc58 AM |
1683 | OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), |
1684 | OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), | |
036dbbfb JK |
1685 | /* end commit contents options */ |
1686 | ||
4741edd5 SB |
1687 | OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty, |
1688 | N_("ok to record an empty change")), | |
1689 | OPT_HIDDEN_BOOL(0, "allow-empty-message", &allow_empty_message, | |
1690 | N_("ok to record a change with an empty message")), | |
036dbbfb JK |
1691 | |
1692 | OPT_END() | |
1693 | }; | |
1694 | ||
f285a2d7 | 1695 | struct strbuf sb = STRBUF_INIT; |
4c28e4ad | 1696 | struct strbuf author_ident = STRBUF_INIT; |
f5bbc322 | 1697 | const char *index_file, *reflog_msg; |
8066df41 | 1698 | struct object_id oid; |
de9f7fa3 | 1699 | struct commit_list *parents = NULL; |
cf10f9fd | 1700 | struct stat statbuf; |
06bb643b | 1701 | struct commit *current_head = NULL; |
ed7a42a0 | 1702 | struct commit_extra_header *extra = NULL; |
c0fe1ed0 | 1703 | struct strbuf err = STRBUF_INIT; |
00d8c311 | 1704 | int ret = 0; |
f5bbc322 | 1705 | |
5d3dd915 NTND |
1706 | if (argc == 2 && !strcmp(argv[1], "-h")) |
1707 | usage_with_options(builtin_commit_usage, builtin_commit_options); | |
1708 | ||
daa1acef DS |
1709 | prepare_repo_settings(the_repository); |
1710 | the_repository->settings.command_requires_full_index = 0; | |
1711 | ||
5c25dfaa | 1712 | status_init_config(&s, git_commit_config); |
4ddb1354 | 1713 | s.commit_template = 1; |
f0915cba | 1714 | status_format = STATUS_FORMAT_NONE; /* Ignore status.short */ |
4d2292e9 | 1715 | s.colopts = 0; |
f5bbc322 | 1716 | |
e82caf38 | 1717 | if (get_oid("HEAD", &oid)) |
06bb643b JH |
1718 | current_head = NULL; |
1719 | else { | |
bc83266a | 1720 | current_head = lookup_commit_or_die(&oid, "HEAD"); |
5e7d4d3e | 1721 | if (parse_commit(current_head)) |
06bb643b JH |
1722 | die(_("could not parse HEAD commit")); |
1723 | } | |
aaab8420 | 1724 | verbose = -1; /* unspecified */ |
036dbbfb JK |
1725 | argc = parse_and_validate_options(argc, argv, builtin_commit_options, |
1726 | builtin_commit_usage, | |
06bb643b | 1727 | prefix, current_head, &s); |
aaab8420 PB |
1728 | if (verbose == -1) |
1729 | verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose; | |
1730 | ||
c9bfb953 | 1731 | if (dry_run) |
e885a84f JK |
1732 | return dry_run_commit(argv, prefix, current_head, &s); |
1733 | index_file = prepare_index(argv, prefix, current_head, 0); | |
f5bbc322 | 1734 | |
ec84bd00 PB |
1735 | /* Set up everything for writing the commit object. This includes |
1736 | running hooks, writing the trees, and interacting with the user. */ | |
06bb643b JH |
1737 | if (!prepare_to_commit(index_file, prefix, |
1738 | current_head, &s, &author_ident)) { | |
00d8c311 | 1739 | ret = 1; |
2888605c | 1740 | rollback_index_files(); |
00d8c311 | 1741 | goto cleanup; |
f5bbc322 KH |
1742 | } |
1743 | ||
f5bbc322 | 1744 | /* Determine parents */ |
643cb5f7 | 1745 | reflog_msg = getenv("GIT_REFLOG_ACTION"); |
06bb643b | 1746 | if (!current_head) { |
643cb5f7 CC |
1747 | if (!reflog_msg) |
1748 | reflog_msg = "commit (initial)"; | |
f5bbc322 | 1749 | } else if (amend) { |
643cb5f7 CC |
1750 | if (!reflog_msg) |
1751 | reflog_msg = "commit (amend)"; | |
de9f7fa3 | 1752 | parents = copy_commit_list(current_head->parents); |
37f7a857 | 1753 | } else if (whence == FROM_MERGE) { |
f285a2d7 | 1754 | struct strbuf m = STRBUF_INIT; |
f5bbc322 | 1755 | FILE *fp; |
e23fd15a | 1756 | int allow_fast_forward = 1; |
de9f7fa3 | 1757 | struct commit_list **pptr = &parents; |
f5bbc322 | 1758 | |
643cb5f7 CC |
1759 | if (!reflog_msg) |
1760 | reflog_msg = "commit (merge)"; | |
de9f7fa3 | 1761 | pptr = commit_list_append(current_head, pptr); |
102de880 | 1762 | fp = xfopen(git_path_merge_head(the_repository), "r"); |
8f309aeb | 1763 | while (strbuf_getline_lf(&m, fp) != EOF) { |
5231c633 JH |
1764 | struct commit *parent; |
1765 | ||
1766 | parent = get_merge_parent(m.buf); | |
1767 | if (!parent) | |
8a6179bc | 1768 | die(_("Corrupt MERGE_HEAD file (%s)"), m.buf); |
de9f7fa3 | 1769 | pptr = commit_list_append(parent, pptr); |
7c3fd25d | 1770 | } |
f5bbc322 KH |
1771 | fclose(fp); |
1772 | strbuf_release(&m); | |
102de880 SB |
1773 | if (!stat(git_path_merge_mode(the_repository), &statbuf)) { |
1774 | if (strbuf_read_file(&sb, git_path_merge_mode(the_repository), 0) < 0) | |
8a6179bc | 1775 | die_errno(_("could not read MERGE_MODE")); |
cf10f9fd MV |
1776 | if (!strcmp(sb.buf, "no-ff")) |
1777 | allow_fast_forward = 0; | |
1778 | } | |
1779 | if (allow_fast_forward) | |
4da72644 | 1780 | reduce_heads_replace(&parents); |
f5bbc322 | 1781 | } else { |
643cb5f7 | 1782 | if (!reflog_msg) |
8d57f757 | 1783 | reflog_msg = is_from_cherry_pick(whence) |
37f7a857 | 1784 | ? "commit (cherry-pick)" |
430b75f7 PW |
1785 | : is_from_rebase(whence) |
1786 | ? "commit (rebase)" | |
37f7a857 | 1787 | : "commit"; |
de9f7fa3 | 1788 | commit_list_insert(current_head, &parents); |
f5bbc322 | 1789 | } |
f5bbc322 | 1790 | |
ec84bd00 | 1791 | /* Finally, get the commit message */ |
cf10f9fd | 1792 | strbuf_reset(&sb); |
e51b0dfc | 1793 | if (strbuf_read_file(&sb, git_path_commit_editmsg(), 0) < 0) { |
0721c314 | 1794 | int saved_errno = errno; |
740001a5 | 1795 | rollback_index_files(); |
8a6179bc | 1796 | die(_("could not read commit message: %s"), strerror(saved_errno)); |
740001a5 | 1797 | } |
99a12694 | 1798 | |
f29cd862 | 1799 | cleanup_message(&sb, cleanup_mode, verbose); |
bc17f35f | 1800 | |
d0aaa46f | 1801 | if (message_is_empty(&sb, cleanup_mode) && !allow_empty_message) { |
b2eda9bd | 1802 | rollback_index_files(); |
bc17f35f | 1803 | fprintf(stderr, _("Aborting commit due to empty commit message.\n")); |
b2eda9bd JH |
1804 | exit(1); |
1805 | } | |
d0aaa46f | 1806 | if (template_untouched(&sb, template_file, cleanup_mode) && !allow_empty_message) { |
2888605c | 1807 | rollback_index_files(); |
bc17f35f | 1808 | fprintf(stderr, _("Aborting commit; you did not edit the message.\n")); |
fdc7c811 | 1809 | exit(1); |
2888605c | 1810 | } |
f5bbc322 | 1811 | |
494d314a CM |
1812 | if (fixup_message && starts_with(sb.buf, "amend! ") && |
1813 | !allow_empty_message) { | |
1814 | struct strbuf body = STRBUF_INIT; | |
1815 | size_t len = commit_subject_length(sb.buf); | |
1816 | strbuf_addstr(&body, sb.buf + len); | |
1817 | if (message_is_empty(&body, cleanup_mode)) { | |
1818 | rollback_index_files(); | |
1819 | fprintf(stderr, _("Aborting commit due to empty commit message body.\n")); | |
1820 | exit(1); | |
1821 | } | |
1822 | strbuf_release(&body); | |
1823 | } | |
1824 | ||
0074d18d | 1825 | if (amend) { |
42d4e1d1 | 1826 | const char *exclude_gpgsig[3] = { "gpgsig", "gpgsig-sha256", NULL }; |
c871a1d1 | 1827 | extra = read_commit_extra_headers(current_head, exclude_gpgsig); |
0074d18d JH |
1828 | } else { |
1829 | struct commit_extra_header **tail = &extra; | |
1830 | append_merge_tag_headers(parents, &tail); | |
1831 | } | |
ed7a42a0 | 1832 | |
dc594180 | 1833 | if (commit_tree_extended(sb.buf, sb.len, &the_index.cache_tree->oid, |
e8cbe211 PW |
1834 | parents, &oid, author_ident.buf, NULL, |
1835 | sign_commit, extra)) { | |
2888605c | 1836 | rollback_index_files(); |
8a6179bc | 1837 | die(_("failed to write commit object")); |
2888605c | 1838 | } |
ed7a42a0 | 1839 | free_commit_extra_headers(extra); |
f5bbc322 | 1840 | |
0505d604 PW |
1841 | if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb, |
1842 | &err)) { | |
2888605c | 1843 | rollback_index_files(); |
c0fe1ed0 | 1844 | die("%s", err.buf); |
2888605c | 1845 | } |
f5bbc322 | 1846 | |
f496b064 | 1847 | sequencer_post_commit_cleanup(the_repository, 0); |
102de880 SB |
1848 | unlink(git_path_merge_head(the_repository)); |
1849 | unlink(git_path_merge_msg(the_repository)); | |
1850 | unlink(git_path_merge_mode(the_repository)); | |
1851 | unlink(git_path_squash_msg(the_repository)); | |
f5bbc322 | 1852 | |
5a9dd399 | 1853 | if (commit_index_files()) |
1a07e59c NTND |
1854 | die(_("repository has been updated, but unable to write\n" |
1855 | "new_index file. Check that disk is not full and quota is\n" | |
80f537f7 | 1856 | "not exceeded, and then \"git restore --staged :/\" to recover.")); |
f5bbc322 | 1857 | |
b23ea979 | 1858 | git_test_write_commit_graph_or_die(); |
859fdc0c | 1859 | |
35843b11 | 1860 | repo_rerere(the_repository, 0); |
a95ce124 | 1861 | run_auto_maintenance(quiet); |
a8cc5943 ÆAB |
1862 | run_commit_hook(use_editor, get_index_file(), NULL, "post-commit", |
1863 | NULL); | |
6f6bee3b | 1864 | if (amend && !no_post_rewrite) { |
1d18d758 | 1865 | commit_post_rewrite(the_repository, current_head, &oid); |
6f6bee3b | 1866 | } |
e47c6caf PW |
1867 | if (!quiet) { |
1868 | unsigned int flags = 0; | |
1869 | ||
1870 | if (!current_head) | |
1871 | flags |= SUMMARY_INITIAL_COMMIT; | |
1872 | if (author_date_is_interesting()) | |
1873 | flags |= SUMMARY_SHOW_AUTHOR_DATE; | |
f11c9580 NTND |
1874 | print_commit_summary(the_repository, prefix, |
1875 | &oid, flags); | |
6f6bee3b | 1876 | } |
f5bbc322 | 1877 | |
a03b5553 DL |
1878 | apply_autostash(git_path_merge_autostash(the_repository)); |
1879 | ||
00d8c311 | 1880 | cleanup: |
ac95f5d3 ÆAB |
1881 | strbuf_release(&author_ident); |
1882 | strbuf_release(&err); | |
1883 | strbuf_release(&sb); | |
00d8c311 | 1884 | return ret; |
f5bbc322 | 1885 | } |