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