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