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