Submodules: Add the new "ignore" config option for diff and status
[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"
9#include "cache-tree.h"
6b2f2d98 10#include "color.h"
2888605c 11#include "dir.h"
f5bbc322
KH
12#include "builtin.h"
13#include "diff.h"
14#include "diffcore.h"
15#include "commit.h"
16#include "revision.h"
17#include "wt-status.h"
18#include "run-command.h"
19#include "refs.h"
20#include "log-tree.h"
21#include "strbuf.h"
22#include "utf8.h"
23#include "parse-options.h"
c455c87c 24#include "string-list.h"
5b2fd956 25#include "rerere.h"
fa9dcf80 26#include "unpack-trees.h"
76e2f7ce 27#include "quote.h"
f5bbc322
KH
28
29static const char * const builtin_commit_usage[] = {
1b1dd23f 30 "git commit [options] [--] <filepattern>...",
f5bbc322
KH
31 NULL
32};
33
2f02b25f 34static const char * const builtin_status_usage[] = {
1b1dd23f 35 "git status [options] [--] <filepattern>...",
2f02b25f
SB
36 NULL
37};
38
49ff9a7a
JK
39static const char implicit_ident_advice[] =
40"Your name and email address were configured automatically based\n"
41"on your username and hostname. Please check that they are accurate.\n"
42"You can suppress this message by setting them explicitly:\n"
43"\n"
8bb45b25 44" git config --global user.name \"Your Name\"\n"
49ff9a7a
JK
45" git config --global user.email you@example.com\n"
46"\n"
47"If the identity used for this commit is wrong, you can fix it with:\n"
48"\n"
49" git commit --amend --author='Your Name <you@example.com>'\n";
50
f197ed2f
JK
51static const char empty_amend_advice[] =
52"You asked to amend the most recent commit, but doing so would make\n"
53"it empty. You can repeat your command with --allow-empty, or you can\n"
54"remove the commit entirely with \"git reset HEAD^\".\n";
55
30988301 56static unsigned char head_sha1[20];
49ff9a7a 57
f5bbc322
KH
58static char *use_message_buffer;
59static const char commit_editmsg[] = "COMMIT_EDITMSG";
2888605c
JH
60static struct lock_file index_lock; /* real index */
61static struct lock_file false_lock; /* used only for partial commits */
62static enum {
63 COMMIT_AS_IS = 1,
64 COMMIT_NORMAL,
4b05548f 65 COMMIT_PARTIAL
2888605c 66} commit_style;
f5bbc322 67
dbd0f5c7 68static const char *logfile, *force_author;
984c6e7e 69static const char *template_file;
f5bbc322 70static char *edit_message, *use_message;
e83dbe80 71static char *author_name, *author_email, *author_date;
f5bbc322 72static int all, edit_flag, also, interactive, only, amend, signoff;
c51f6cee 73static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
c9b5fde7 74static int no_post_rewrite, allow_empty_message;
46a958b3 75static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
5f065737
AR
76/*
77 * The default commit message cleanup mode will remove the lines
78 * beginning with # (shell comments) and leading and trailing
79 * whitespaces (empty lines or containing only whitespaces)
80 * if editor is used, and only the whitespaces if the message
81 * is specified explicitly.
82 */
83static enum {
84 CLEANUP_SPACE,
85 CLEANUP_NONE,
4b05548f 86 CLEANUP_ALL
5f065737
AR
87} cleanup_mode;
88static char *cleanup_arg;
f5bbc322 89
bed575e4 90static int use_editor = 1, initial_commit, in_merge, include_status = 1;
2381e39e 91static int show_ignored_in_status;
3b6aeb3c
JS
92static const char *only_include_assumed;
93static struct strbuf message;
f9568530 94
7c9f7038
JK
95static int null_termination;
96static enum {
97 STATUS_FORMAT_LONG,
98 STATUS_FORMAT_SHORT,
4b05548f 99 STATUS_FORMAT_PORCELAIN
7c9f7038 100} status_format = STATUS_FORMAT_LONG;
05a59a08 101static int status_show_branch;
7c9f7038 102
f9568530
JS
103static int opt_parse_m(const struct option *opt, const char *arg, int unset)
104{
105 struct strbuf *buf = opt->value;
106 if (unset)
107 strbuf_setlen(buf, 0);
108 else {
109 strbuf_addstr(buf, arg);
3b6aeb3c 110 strbuf_addstr(buf, "\n\n");
f9568530
JS
111 }
112 return 0;
113}
f5bbc322
KH
114
115static struct option builtin_commit_options[] = {
116 OPT__QUIET(&quiet),
117 OPT__VERBOSE(&verbose),
f5bbc322 118
e97ca7f4 119 OPT_GROUP("Commit message options"),
df217ed6 120 OPT_FILENAME('F', "file", &logfile, "read log from file"),
f5bbc322 121 OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
02b47cd7 122 OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
f9568530 123 OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
c51f6cee 124 OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
f5bbc322 125 OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
c51f6cee 126 OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
362b0dd5 127 OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
df217ed6 128 OPT_FILENAME('t', "template", &template_file, "use specified template file"),
f5bbc322 129 OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
e97ca7f4 130 OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
bed575e4 131 OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
e97ca7f4 132 /* end commit message options */
f5bbc322
KH
133
134 OPT_GROUP("Commit contents options"),
135 OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
136 OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
137 OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
d4ba07ca 138 OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
f5bbc322 139 OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
3a5d13a3 140 OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
7c9f7038
JK
141 OPT_SET_INT(0, "short", &status_format, "show status concisely",
142 STATUS_FORMAT_SHORT),
05a59a08 143 OPT_BOOLEAN(0, "branch", &status_show_branch, "show branch information"),
7c9f7038
JK
144 OPT_SET_INT(0, "porcelain", &status_format,
145 "show porcelain output format", STATUS_FORMAT_PORCELAIN),
146 OPT_BOOLEAN('z', "null", &null_termination,
147 "terminate entries with NUL"),
f5bbc322 148 OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
6f6bee3b 149 OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
6c2ce048 150 { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
e97ca7f4 151 /* end commit contents options */
f5bbc322 152
c9b5fde7
ÆAB
153 { OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
154 "ok to record an empty change",
155 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
156 { OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
157 "ok to record a change with an empty message",
158 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
159
f5bbc322
KH
160 OPT_END()
161};
162
2888605c
JH
163static void rollback_index_files(void)
164{
165 switch (commit_style) {
166 case COMMIT_AS_IS:
167 break; /* nothing to do */
168 case COMMIT_NORMAL:
169 rollback_lock_file(&index_lock);
170 break;
171 case COMMIT_PARTIAL:
172 rollback_lock_file(&index_lock);
173 rollback_lock_file(&false_lock);
174 break;
175 }
176}
177
5a9dd399 178static int commit_index_files(void)
2888605c 179{
5a9dd399
BC
180 int err = 0;
181
2888605c
JH
182 switch (commit_style) {
183 case COMMIT_AS_IS:
184 break; /* nothing to do */
185 case COMMIT_NORMAL:
5a9dd399 186 err = commit_lock_file(&index_lock);
2888605c
JH
187 break;
188 case COMMIT_PARTIAL:
5a9dd399 189 err = commit_lock_file(&index_lock);
2888605c
JH
190 rollback_lock_file(&false_lock);
191 break;
192 }
5a9dd399
BC
193
194 return err;
2888605c
JH
195}
196
197/*
198 * Take a union of paths in the index and the named tree (typically, "HEAD"),
199 * and return the paths that match the given pattern in list.
200 */
c455c87c 201static int list_paths(struct string_list *list, const char *with_tree,
2888605c
JH
202 const char *prefix, const char **pattern)
203{
204 int i;
205 char *m;
206
207 for (i = 0; pattern[i]; i++)
208 ;
209 m = xcalloc(1, i);
210
211 if (with_tree)
212 overlay_tree_on_cache(with_tree, prefix);
213
214 for (i = 0; i < active_nr; i++) {
215 struct cache_entry *ce = active_cache[i];
7fce6e3c
NTND
216 struct string_list_item *item;
217
7a51ed66 218 if (ce->ce_flags & CE_UPDATE)
e87e22d0 219 continue;
0b50922a 220 if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
2888605c 221 continue;
78a395d3 222 item = string_list_insert(list, ce->name);
7fce6e3c
NTND
223 if (ce_skip_worktree(ce))
224 item->util = item; /* better a valid pointer than a fake one */
2888605c
JH
225 }
226
227 return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
228}
229
c455c87c 230static void add_remove_files(struct string_list *list)
2888605c
JH
231{
232 int i;
233 for (i = 0; i < list->nr; i++) {
d177cab0 234 struct stat st;
c455c87c 235 struct string_list_item *p = &(list->items[i]);
d177cab0 236
7fce6e3c
NTND
237 /* p->util is skip-worktree */
238 if (p->util)
b4d1690d 239 continue;
d177cab0 240
c455c87c
JS
241 if (!lstat(p->string, &st)) {
242 if (add_to_cache(p->string, &st, 0))
960b8ad1
AR
243 die("updating files failed");
244 } else
c455c87c 245 remove_file_from_cache(p->string);
2888605c
JH
246 }
247}
248
fa9dcf80
LT
249static void create_base_index(void)
250{
251 struct tree *tree;
252 struct unpack_trees_options opts;
253 struct tree_desc t;
254
255 if (initial_commit) {
256 discard_cache();
257 return;
258 }
259
260 memset(&opts, 0, sizeof(opts));
261 opts.head_idx = 1;
262 opts.index_only = 1;
263 opts.merge = 1;
34110cd4
LT
264 opts.src_index = &the_index;
265 opts.dst_index = &the_index;
fa9dcf80
LT
266
267 opts.fn = oneway_merge;
268 tree = parse_tree_indirect(head_sha1);
269 if (!tree)
270 die("failed to unpack HEAD tree object");
271 parse_tree(tree);
272 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
273 if (unpack_trees(1, &t, &opts))
274 exit(128); /* We've already reported the error, finish dying */
fa9dcf80
LT
275}
276
d38a30df
MM
277static void refresh_cache_or_die(int refresh_flags)
278{
279 /*
280 * refresh_flags contains REFRESH_QUIET, so the only errors
281 * are for unmerged entries.
282 */
283 if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))
284 die_resolve_conflict("commit");
285}
286
50b7e70f 287static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
f5bbc322
KH
288{
289 int fd;
c455c87c 290 struct string_list partial;
2888605c 291 const char **pathspec = NULL;
50b7e70f 292 int refresh_flags = REFRESH_QUIET;
f5bbc322 293
50b7e70f
JH
294 if (is_status)
295 refresh_flags |= REFRESH_UNMERGED;
f5bbc322 296 if (interactive) {
4f6a32f8
JK
297 if (interactive_add(argc, argv, prefix) != 0)
298 die("interactive add failed");
671c9b7e 299 if (read_cache_preload(NULL) < 0)
d5350fd2 300 die("index file corrupt");
2888605c 301 commit_style = COMMIT_AS_IS;
f5bbc322
KH
302 return get_index_file();
303 }
304
f64fe7b4
JH
305 if (*argv)
306 pathspec = get_pathspec(prefix, argv);
2888605c 307
671c9b7e
LT
308 if (read_cache_preload(pathspec) < 0)
309 die("index file corrupt");
310
2888605c
JH
311 /*
312 * Non partial, non as-is commit.
313 *
314 * (1) get the real index;
315 * (2) update the_index as necessary;
316 * (3) write the_index out to the real index (still locked);
317 * (4) return the name of the locked index file.
318 *
319 * The caller should run hooks on the locked real index, and
320 * (A) if all goes well, commit the real index;
321 * (B) on failure, rollback the real index.
322 */
323 if (all || (also && pathspec && *pathspec)) {
1f2362a9 324 fd = hold_locked_index(&index_lock, 1);
7ae02a30 325 add_files_to_cache(also ? prefix : NULL, pathspec, 0);
d38a30df 326 refresh_cache_or_die(refresh_flags);
4ed7cd3a
BC
327 if (write_cache(fd, active_cache, active_nr) ||
328 close_lock_file(&index_lock))
f5bbc322 329 die("unable to write new_index file");
2888605c
JH
330 commit_style = COMMIT_NORMAL;
331 return index_lock.filename;
f5bbc322
KH
332 }
333
2888605c
JH
334 /*
335 * As-is commit.
336 *
337 * (1) return the name of the real index file.
338 *
73276235
MH
339 * The caller should run hooks on the real index,
340 * and create commit from the_index.
2888605c
JH
341 * We still need to refresh the index here.
342 */
343 if (!pathspec || !*pathspec) {
344 fd = hold_locked_index(&index_lock, 1);
d38a30df 345 refresh_cache_or_die(refresh_flags);
d5f5d0a9
JH
346 if (active_cache_changed) {
347 if (write_cache(fd, active_cache, active_nr) ||
348 commit_locked_index(&index_lock))
349 die("unable to write new_index file");
350 } else {
351 rollback_lock_file(&index_lock);
352 }
2888605c 353 commit_style = COMMIT_AS_IS;
f5bbc322
KH
354 return get_index_file();
355 }
356
2888605c
JH
357 /*
358 * A partial commit.
359 *
360 * (0) find the set of affected paths;
361 * (1) get lock on the real index file;
362 * (2) update the_index with the given paths;
363 * (3) write the_index out to the real index (still locked);
364 * (4) get lock on the false index file;
365 * (5) reset the_index from HEAD;
366 * (6) update the_index the same way as (2);
367 * (7) write the_index out to the false index file;
368 * (8) return the name of the false index file (still locked);
369 *
370 * The caller should run hooks on the locked false index, and
371 * create commit from it. Then
372 * (A) if all goes well, commit the real index;
373 * (B) on failure, rollback the real index;
374 * In either case, rollback the false index.
375 */
376 commit_style = COMMIT_PARTIAL;
377
30988301 378 if (in_merge)
2888605c
JH
379 die("cannot do a partial commit during a merge.");
380
381 memset(&partial, 0, sizeof(partial));
c455c87c 382 partial.strdup_strings = 1;
2888605c
JH
383 if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
384 exit(1);
385
386 discard_cache();
387 if (read_cache() < 0)
388 die("cannot read the index");
389
390 fd = hold_locked_index(&index_lock, 1);
391 add_remove_files(&partial);
ef12b50d 392 refresh_cache(REFRESH_QUIET);
4ed7cd3a
BC
393 if (write_cache(fd, active_cache, active_nr) ||
394 close_lock_file(&index_lock))
f5bbc322
KH
395 die("unable to write new_index file");
396
2888605c 397 fd = hold_lock_file_for_update(&false_lock,
a157400c
JH
398 git_path("next-index-%"PRIuMAX,
399 (uintmax_t) getpid()),
acd3b9ec 400 LOCK_DIE_ON_ERROR);
fa9dcf80
LT
401
402 create_base_index();
2888605c 403 add_remove_files(&partial);
d37d3203 404 refresh_cache(REFRESH_QUIET);
f5bbc322 405
4ed7cd3a
BC
406 if (write_cache(fd, active_cache, active_nr) ||
407 close_lock_file(&false_lock))
2888605c 408 die("unable to write temporary index file");
959ba670
JK
409
410 discard_cache();
411 read_cache_from(false_lock.filename);
412
2888605c 413 return false_lock.filename;
f5bbc322
KH
414}
415
d249b098
JH
416static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
417 struct wt_status *s)
f5bbc322 418{
76e2f7ce
JH
419 unsigned char sha1[20];
420
d249b098
JH
421 if (s->relative_paths)
422 s->prefix = prefix;
f5bbc322
KH
423
424 if (amend) {
d249b098
JH
425 s->amend = 1;
426 s->reference = "HEAD^1";
f5bbc322 427 }
d249b098
JH
428 s->verbose = verbose;
429 s->index_file = index_file;
430 s->fp = fp;
431 s->nowarn = nowarn;
76e2f7ce 432 s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
f5bbc322 433
76e2f7ce 434 wt_status_collect(s);
7c9f7038
JK
435
436 switch (status_format) {
437 case STATUS_FORMAT_SHORT:
05a59a08 438 wt_shortstatus_print(s, null_termination, status_show_branch);
7c9f7038
JK
439 break;
440 case STATUS_FORMAT_PORCELAIN:
4a7cc2fd 441 wt_porcelain_print(s, null_termination);
7c9f7038
JK
442 break;
443 case STATUS_FORMAT_LONG:
444 wt_status_print(s);
445 break;
446 }
f5bbc322 447
d249b098 448 return s->commitable;
f5bbc322
KH
449}
450
ec84bd00
PB
451static int is_a_merge(const unsigned char *sha1)
452{
453 struct commit *commit = lookup_commit(sha1);
454 if (!commit || parse_commit(commit))
455 die("could not parse HEAD commit");
456 return !!(commit->parents && commit->parents->next);
457}
458
f5bbc322
KH
459static const char sign_off_header[] = "Signed-off-by: ";
460
e83dbe80 461static void determine_author_info(void)
a45d46ba
SB
462{
463 char *name, *email, *date;
464
465 name = getenv("GIT_AUTHOR_NAME");
466 email = getenv("GIT_AUTHOR_EMAIL");
467 date = getenv("GIT_AUTHOR_DATE");
468
c51f6cee 469 if (use_message && !renew_authorship) {
a45d46ba
SB
470 const char *a, *lb, *rb, *eol;
471
472 a = strstr(use_message_buffer, "\nauthor ");
473 if (!a)
474 die("invalid commit: %s", use_message);
475
fb7749e4
JN
476 lb = strchrnul(a + strlen("\nauthor "), '<');
477 rb = strchrnul(lb, '>');
478 eol = strchrnul(rb, '\n');
479 if (!*lb || !*rb || !*eol)
a45d46ba
SB
480 die("invalid commit: %s", use_message);
481
fb7749e4
JN
482 if (lb == a + strlen("\nauthor "))
483 /* \nauthor <foo@example.com> */
484 name = xcalloc(1, 1);
485 else
486 name = xmemdupz(a + strlen("\nauthor "),
487 (lb - strlen(" ") -
488 (a + strlen("\nauthor "))));
489 email = xmemdupz(lb + strlen("<"), rb - (lb + strlen("<")));
490 date = xmemdupz(rb + strlen("> "), eol - (rb + strlen("> ")));
a45d46ba
SB
491 }
492
493 if (force_author) {
494 const char *lb = strstr(force_author, " <");
495 const char *rb = strchr(force_author, '>');
496
497 if (!lb || !rb)
498 die("malformed --author parameter");
499 name = xstrndup(force_author, lb - force_author);
500 email = xstrndup(lb + 2, rb - (lb + 2));
501 }
502
02b47cd7
MV
503 if (force_date)
504 date = force_date;
505
e83dbe80
SB
506 author_name = name;
507 author_email = email;
508 author_date = date;
a45d46ba
SB
509}
510
c1e01b0c
DB
511static int ends_rfc2822_footer(struct strbuf *sb)
512{
513 int ch;
514 int hit = 0;
515 int i, j, k;
516 int len = sb->len;
517 int first = 1;
518 const char *buf = sb->buf;
519
520 for (i = len - 1; i > 0; i--) {
521 if (hit && buf[i] == '\n')
522 break;
523 hit = (buf[i] == '\n');
524 }
525
526 while (i < len - 1 && buf[i] == '\n')
527 i++;
528
529 for (; i < len; i = k) {
530 for (k = i; k < len && buf[k] != '\n'; k++)
531 ; /* do nothing */
532 k++;
533
534 if ((buf[k] == ' ' || buf[k] == '\t') && !first)
535 continue;
536
537 first = 0;
538
539 for (j = 0; i + j < len; j++) {
540 ch = buf[i + j];
541 if (ch == ':')
542 break;
543 if (isalnum(ch) ||
544 (ch == '-'))
545 continue;
546 return 0;
547 }
548 }
549 return 1;
550}
551
d249b098
JH
552static int prepare_to_commit(const char *index_file, const char *prefix,
553 struct wt_status *s)
f5bbc322
KH
554{
555 struct stat statbuf;
bc5d248a 556 int commitable, saved_color_setting;
f285a2d7 557 struct strbuf sb = STRBUF_INIT;
f5bbc322
KH
558 char *buffer;
559 FILE *fp;
8089c85b
PB
560 const char *hook_arg1 = NULL;
561 const char *hook_arg2 = NULL;
bb1ae3f6 562 int ident_shown = 0;
f5bbc322 563
ec84bd00
PB
564 if (!no_verify && run_hook(index_file, "pre-commit", NULL))
565 return 0;
f5bbc322 566
f9568530
JS
567 if (message.len) {
568 strbuf_addbuf(&sb, &message);
8089c85b 569 hook_arg1 = "message";
f5bbc322
KH
570 } else if (logfile && !strcmp(logfile, "-")) {
571 if (isatty(0))
572 fprintf(stderr, "(reading log message from standard input)\n");
573 if (strbuf_read(&sb, 0, 0) < 0)
0721c314 574 die_errno("could not read log from standard input");
8089c85b 575 hook_arg1 = "message";
f5bbc322
KH
576 } else if (logfile) {
577 if (strbuf_read_file(&sb, logfile, 0) < 0)
d824cbba
TR
578 die_errno("could not read log file '%s'",
579 logfile);
8089c85b 580 hook_arg1 = "message";
f5bbc322
KH
581 } else if (use_message) {
582 buffer = strstr(use_message_buffer, "\n\n");
583 if (!buffer || buffer[2] == '\0')
584 die("commit has empty message");
585 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
8089c85b
PB
586 hook_arg1 = "commit";
587 hook_arg2 = use_message;
f5bbc322
KH
588 } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
589 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
d824cbba 590 die_errno("could not read MERGE_MSG");
8089c85b 591 hook_arg1 = "merge";
f5bbc322
KH
592 } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
593 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
d824cbba 594 die_errno("could not read SQUASH_MSG");
8089c85b 595 hook_arg1 = "squash";
f5bbc322
KH
596 } else if (template_file && !stat(template_file, &statbuf)) {
597 if (strbuf_read_file(&sb, template_file, 0) < 0)
d824cbba 598 die_errno("could not read '%s'", template_file);
8089c85b 599 hook_arg1 = "template";
f5bbc322
KH
600 }
601
8089c85b
PB
602 /*
603 * This final case does not modify the template message,
604 * it just sets the argument to the prepare-commit-msg hook.
605 */
606 else if (in_merge)
607 hook_arg1 = "merge";
608
f5bbc322
KH
609 fp = fopen(git_path(commit_editmsg), "w");
610 if (fp == NULL)
d824cbba 611 die_errno("could not open '%s'", git_path(commit_editmsg));
f5bbc322 612
5f065737
AR
613 if (cleanup_mode != CLEANUP_NONE)
614 stripspace(&sb, 0);
f5bbc322
KH
615
616 if (signoff) {
f285a2d7 617 struct strbuf sob = STRBUF_INIT;
13208572
JS
618 int i;
619
13208572 620 strbuf_addstr(&sob, sign_off_header);
d9ccfe77
JH
621 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
622 getenv("GIT_COMMITTER_EMAIL")));
13208572 623 strbuf_addch(&sob, '\n');
13208572
JS
624 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
625 ; /* do nothing */
2150554b 626 if (prefixcmp(sb.buf + i, sob.buf)) {
e5138436 627 if (!i || !ends_rfc2822_footer(&sb))
2150554b 628 strbuf_addch(&sb, '\n');
13208572 629 strbuf_addbuf(&sb, &sob);
2150554b 630 }
13208572 631 strbuf_release(&sob);
f5bbc322
KH
632 }
633
13208572 634 if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
d824cbba 635 die_errno("could not write commit template");
13208572 636
f5bbc322
KH
637 strbuf_release(&sb);
638
e83dbe80
SB
639 determine_author_info();
640
bb1ae3f6
SB
641 /* This checks if committer ident is explicitly given */
642 git_committer_info(0);
bed575e4 643 if (use_editor && include_status) {
e83dbe80
SB
644 char *author_ident;
645 const char *committer_ident;
646
ec84bd00
PB
647 if (in_merge)
648 fprintf(fp,
649 "#\n"
650 "# It looks like you may be committing a MERGE.\n"
651 "# If this is not correct, please remove the file\n"
652 "# %s\n"
653 "# and try again.\n"
654 "#\n",
655 git_path("MERGE_HEAD"));
656
657 fprintf(fp,
658 "\n"
fdc7c811 659 "# Please enter the commit message for your changes.");
ec84bd00 660 if (cleanup_mode == CLEANUP_ALL)
fdc7c811
JK
661 fprintf(fp,
662 " Lines starting\n"
663 "# with '#' will be ignored, and an empty"
664 " message aborts the commit.\n");
ec84bd00 665 else /* CLEANUP_SPACE, that is. */
fdc7c811
JK
666 fprintf(fp,
667 " Lines starting\n"
668 "# with '#' will be kept; you may remove them"
669 " yourself if you want to.\n"
670 "# An empty message aborts the commit.\n");
ec84bd00
PB
671 if (only_include_assumed)
672 fprintf(fp, "# %s\n", only_include_assumed);
673
e83dbe80
SB
674 author_ident = xstrdup(fmt_name(author_name, author_email));
675 committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
676 getenv("GIT_COMMITTER_EMAIL"));
677 if (strcmp(author_ident, committer_ident))
678 fprintf(fp,
bb1ae3f6
SB
679 "%s"
680 "# Author: %s\n",
681 ident_shown++ ? "" : "#\n",
e83dbe80
SB
682 author_ident);
683 free(author_ident);
684
5aeb3a3a 685 if (!user_ident_sufficiently_given())
bb1ae3f6
SB
686 fprintf(fp,
687 "%s"
688 "# Committer: %s\n",
689 ident_shown++ ? "" : "#\n",
690 committer_ident);
691
692 if (ident_shown)
693 fprintf(fp, "#\n");
694
d249b098
JH
695 saved_color_setting = s->use_color;
696 s->use_color = 0;
697 commitable = run_status(fp, index_file, prefix, 1, s);
698 s->use_color = saved_color_setting;
ec84bd00 699 } else {
d616a239 700 unsigned char sha1[20];
fbcf1184 701 const char *parent = "HEAD";
7168624c 702
7168624c
AR
703 if (!active_nr && read_cache() < 0)
704 die("Cannot read index");
705
fbcf1184
JH
706 if (amend)
707 parent = "HEAD^1";
708
d616a239 709 if (get_sha1(parent, sha1))
ec84bd00 710 commitable = !!active_nr;
75f3ff2e
SB
711 else
712 commitable = index_differs_from(parent, 0);
ec84bd00 713 }
d616a239 714
ec84bd00 715 fclose(fp);
7168624c 716
ec84bd00
PB
717 if (!commitable && !in_merge && !allow_empty &&
718 !(amend && is_a_merge(head_sha1))) {
d249b098 719 run_status(stdout, index_file, prefix, 0, s);
f197ed2f
JK
720 if (amend)
721 fputs(empty_amend_advice, stderr);
ec84bd00 722 return 0;
7168624c
AR
723 }
724
ec84bd00
PB
725 /*
726 * Re-read the index as pre-commit hook could have updated it,
727 * and write it out as a tree. We must do this before we invoke
728 * the editor and after we invoke run_status above.
729 */
730 discard_cache();
731 read_cache_from(index_file);
732 if (!active_cache_tree)
733 active_cache_tree = cache_tree();
734 if (cache_tree_update(active_cache_tree,
735 active_cache, active_nr, 0, 0) < 0) {
331fcb59 736 error("Error building trees");
ec84bd00 737 return 0;
7168624c 738 }
f5bbc322 739
8089c85b
PB
740 if (run_hook(index_file, "prepare-commit-msg",
741 git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
742 return 0;
f5bbc322 743
ec84bd00
PB
744 if (use_editor) {
745 char index[PATH_MAX];
66dbfd55
GV
746 const char *env[2] = { NULL };
747 env[0] = index;
ec84bd00 748 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
7198203a
SB
749 if (launch_editor(git_path(commit_editmsg), NULL, env)) {
750 fprintf(stderr,
751 "Please supply the message using either -m or -F option.\n");
752 exit(1);
753 }
ec84bd00 754 }
f5bbc322 755
ec84bd00
PB
756 if (!no_verify &&
757 run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
758 return 0;
759 }
f5bbc322 760
ec84bd00 761 return 1;
f5bbc322
KH
762}
763
764/*
6bb6b034
MV
765 * Find out if the message in the strbuf contains only whitespace and
766 * Signed-off-by lines.
f5bbc322 767 */
6bb6b034 768static int message_is_empty(struct strbuf *sb)
f5bbc322 769{
f285a2d7 770 struct strbuf tmpl = STRBUF_INIT;
f5bbc322 771 const char *nl;
6bb6b034 772 int eol, i, start = 0;
f5bbc322 773
5f065737
AR
774 if (cleanup_mode == CLEANUP_NONE && sb->len)
775 return 0;
776
f5bbc322 777 /* See if the template is just a prefix of the message. */
f5bbc322 778 if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
5f065737 779 stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
f5bbc322
KH
780 if (start + tmpl.len <= sb->len &&
781 memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
782 start += tmpl.len;
783 }
784 strbuf_release(&tmpl);
785
786 /* Check if the rest is just whitespace and Signed-of-by's. */
787 for (i = start; i < sb->len; i++) {
788 nl = memchr(sb->buf + i, '\n', sb->len - i);
789 if (nl)
790 eol = nl - sb->buf;
791 else
792 eol = sb->len;
793
794 if (strlen(sign_off_header) <= eol - i &&
795 !prefixcmp(sb->buf + i, sign_off_header)) {
796 i = eol;
797 continue;
798 }
799 while (i < eol)
800 if (!isspace(sb->buf[i++]))
801 return 0;
802 }
803
804 return 1;
805}
806
146ea068
JH
807static const char *find_author_by_nickname(const char *name)
808{
809 struct rev_info revs;
810 struct commit *commit;
811 struct strbuf buf = STRBUF_INIT;
812 const char *av[20];
813 int ac = 0;
814
815 init_revisions(&revs, NULL);
816 strbuf_addf(&buf, "--author=%s", name);
817 av[++ac] = "--all";
818 av[++ac] = "-i";
819 av[++ac] = buf.buf;
820 av[++ac] = NULL;
821 setup_revisions(ac, av, &revs, NULL);
822 prepare_revision_walk(&revs);
823 commit = get_revision(&revs);
824 if (commit) {
dd2e794a
TR
825 struct pretty_print_context ctx = {0};
826 ctx.date_mode = DATE_NORMAL;
146ea068 827 strbuf_release(&buf);
dd2e794a 828 format_commit_message(commit, "%an <%ae>", &buf, &ctx);
146ea068
JH
829 return strbuf_detach(&buf, NULL);
830 }
831 die("No existing author found with '%s'", name);
832}
833
76e2f7ce
JH
834
835static void handle_untracked_files_arg(struct wt_status *s)
836{
837 if (!untracked_files_arg)
838 ; /* default already initialized */
839 else if (!strcmp(untracked_files_arg, "no"))
840 s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
841 else if (!strcmp(untracked_files_arg, "normal"))
842 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
843 else if (!strcmp(untracked_files_arg, "all"))
844 s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
845 else
846 die("Invalid untracked files mode '%s'", untracked_files_arg);
847}
848
2f02b25f 849static int parse_and_validate_options(int argc, const char *argv[],
dbd0f5c7 850 const char * const usage[],
d249b098
JH
851 const char *prefix,
852 struct wt_status *s)
f5bbc322
KH
853{
854 int f = 0;
855
37782920
SB
856 argc = parse_options(argc, argv, prefix, builtin_commit_options, usage,
857 0);
f5bbc322 858
146ea068
JH
859 if (force_author && !strchr(force_author, '>'))
860 force_author = find_author_by_nickname(force_author);
861
c51f6cee
EM
862 if (force_author && renew_authorship)
863 die("Using both --reset-author and --author does not make sense");
864
f9568530 865 if (logfile || message.len || use_message)
4803466f 866 use_editor = 0;
f5bbc322 867 if (edit_flag)
4803466f 868 use_editor = 1;
406400ce
PB
869 if (!use_editor)
870 setenv("GIT_EDITOR", ":", 1);
f5bbc322
KH
871
872 if (get_sha1("HEAD", head_sha1))
873 initial_commit = 1;
874
f5bbc322
KH
875 /* Sanity check options */
876 if (amend && initial_commit)
877 die("You have nothing to amend.");
878 if (amend && in_merge)
b5b644a9 879 die("You are in the middle of a merge -- cannot amend.");
f5bbc322
KH
880
881 if (use_message)
882 f++;
883 if (edit_message)
884 f++;
885 if (logfile)
886 f++;
887 if (f > 1)
888 die("Only one of -c/-C/-F can be used.");
f9568530 889 if (message.len && f > 0)
f5bbc322
KH
890 die("Option -m cannot be combined with -c/-C/-F.");
891 if (edit_message)
892 use_message = edit_message;
1eb1e9ee 893 if (amend && !use_message)
f5bbc322 894 use_message = "HEAD";
c51f6cee
EM
895 if (!use_message && renew_authorship)
896 die("--reset-author can be used only with -C, -c or --amend.");
f5bbc322
KH
897 if (use_message) {
898 unsigned char sha1[20];
899 static char utf8[] = "UTF-8";
900 const char *out_enc;
901 char *enc, *end;
902 struct commit *commit;
903
904 if (get_sha1(use_message, sha1))
905 die("could not lookup commit %s", use_message);
8a2f8733 906 commit = lookup_commit_reference(sha1);
f5bbc322
KH
907 if (!commit || parse_commit(commit))
908 die("could not parse commit %s", use_message);
909
910 enc = strstr(commit->buffer, "\nencoding");
911 if (enc) {
912 end = strchr(enc + 10, '\n');
913 enc = xstrndup(enc + 10, end - (enc + 10));
914 } else {
915 enc = utf8;
916 }
917 out_enc = git_commit_encoding ? git_commit_encoding : utf8;
918
919 if (strcmp(out_enc, enc))
920 use_message_buffer =
921 reencode_string(commit->buffer, out_enc, enc);
922
923 /*
924 * If we failed to reencode the buffer, just copy it
925 * byte for byte so the user can try to fix it up.
926 * This also handles the case where input and output
927 * encodings are identical.
928 */
929 if (use_message_buffer == NULL)
930 use_message_buffer = xstrdup(commit->buffer);
931 if (enc != utf8)
932 free(enc);
933 }
934
935 if (!!also + !!only + !!all + !!interactive > 1)
936 die("Only one of --include/--only/--all/--interactive can be used.");
937 if (argc == 0 && (also || (only && !amend)))
938 die("No paths with --include/--only does not make sense.");
939 if (argc == 0 && only && amend)
940 only_include_assumed = "Clever... amending the last one with dirty index.";
3c5283f8 941 if (argc > 0 && !also && !only)
f5bbc322 942 only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
5f065737
AR
943 if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
944 cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
945 else if (!strcmp(cleanup_arg, "verbatim"))
946 cleanup_mode = CLEANUP_NONE;
947 else if (!strcmp(cleanup_arg, "whitespace"))
948 cleanup_mode = CLEANUP_SPACE;
949 else if (!strcmp(cleanup_arg, "strip"))
950 cleanup_mode = CLEANUP_ALL;
951 else
952 die("Invalid cleanup mode %s", cleanup_arg);
f5bbc322 953
76e2f7ce 954 handle_untracked_files_arg(s);
4bfee30a 955
f5bbc322
KH
956 if (all && argc > 0)
957 die("Paths with -a does not make sense.");
958 else if (interactive && argc > 0)
959 die("Paths with --interactive does not make sense.");
960
7c9f7038
JK
961 if (null_termination && status_format == STATUS_FORMAT_LONG)
962 status_format = STATUS_FORMAT_PORCELAIN;
963 if (status_format != STATUS_FORMAT_LONG)
964 dry_run = 1;
965
f5bbc322
KH
966 return argc;
967}
968
d249b098
JH
969static int dry_run_commit(int argc, const char **argv, const char *prefix,
970 struct wt_status *s)
f5bbc322 971{
f5bbc322 972 int commitable;
3a5d13a3 973 const char *index_file;
f5bbc322 974
3a5d13a3 975 index_file = prepare_index(argc, argv, prefix, 1);
d249b098 976 commitable = run_status(stdout, index_file, prefix, 0, s);
3a5d13a3 977 rollback_index_files();
f5bbc322 978
3a5d13a3
JH
979 return commitable ? 0 : 1;
980}
981
f766b367
JH
982static int parse_status_slot(const char *var, int offset)
983{
984 if (!strcasecmp(var+offset, "header"))
985 return WT_STATUS_HEADER;
986 if (!strcasecmp(var+offset, "updated")
987 || !strcasecmp(var+offset, "added"))
988 return WT_STATUS_UPDATED;
989 if (!strcasecmp(var+offset, "changed"))
990 return WT_STATUS_CHANGED;
991 if (!strcasecmp(var+offset, "untracked"))
992 return WT_STATUS_UNTRACKED;
993 if (!strcasecmp(var+offset, "nobranch"))
994 return WT_STATUS_NOBRANCH;
995 if (!strcasecmp(var+offset, "unmerged"))
996 return WT_STATUS_UNMERGED;
8b8e8624 997 return -1;
f766b367
JH
998}
999
1000static int git_status_config(const char *k, const char *v, void *cb)
1001{
1002 struct wt_status *s = cb;
1003
1004 if (!strcmp(k, "status.submodulesummary")) {
1005 int is_bool;
1006 s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
1007 if (is_bool && s->submodule_summary)
1008 s->submodule_summary = -1;
1009 return 0;
1010 }
1011 if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
1012 s->use_color = git_config_colorbool(k, v, -1);
1013 return 0;
1014 }
1015 if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
1016 int slot = parse_status_slot(k, 13);
8b8e8624
JK
1017 if (slot < 0)
1018 return 0;
f766b367
JH
1019 if (!v)
1020 return config_error_nonbool(k);
1021 color_parse(v, k, s->color_palette[slot]);
1022 return 0;
1023 }
1024 if (!strcmp(k, "status.relativepaths")) {
1025 s->relative_paths = git_config_bool(k, v);
1026 return 0;
1027 }
1028 if (!strcmp(k, "status.showuntrackedfiles")) {
1029 if (!v)
1030 return config_error_nonbool(k);
1031 else if (!strcmp(v, "no"))
1032 s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
1033 else if (!strcmp(v, "normal"))
1034 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
1035 else if (!strcmp(v, "all"))
1036 s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
1037 else
1038 return error("Invalid untracked files mode '%s'", v);
1039 return 0;
1040 }
1041 return git_diff_ui_config(k, v, NULL);
1042}
1043
3a5d13a3
JH
1044int cmd_status(int argc, const char **argv, const char *prefix)
1045{
d249b098 1046 struct wt_status s;
4bb6644d 1047 int fd;
76e2f7ce 1048 unsigned char sha1[20];
9e4b7ab6 1049 static struct option builtin_status_options[] = {
76e2f7ce 1050 OPT__VERBOSE(&verbose),
dd2be243
JK
1051 OPT_SET_INT('s', "short", &status_format,
1052 "show status concisely", STATUS_FORMAT_SHORT),
05a59a08
DKF
1053 OPT_BOOLEAN('b', "branch", &status_show_branch,
1054 "show branch information"),
6f157871
JK
1055 OPT_SET_INT(0, "porcelain", &status_format,
1056 "show porcelain output format",
1057 STATUS_FORMAT_PORCELAIN),
173e6c88
JH
1058 OPT_BOOLEAN('z', "null", &null_termination,
1059 "terminate entries with NUL"),
76e2f7ce
JH
1060 { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
1061 "mode",
1062 "show untracked files, optional modes: all, normal, no. (Default: all)",
1063 PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
2381e39e
JH
1064 OPT_BOOLEAN(0, "ignored", &show_ignored_in_status,
1065 "show ignored files"),
46a958b3
JL
1066 { OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, "when",
1067 "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)",
1068 PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
76e2f7ce
JH
1069 OPT_END(),
1070 };
1071
dd2be243 1072 if (null_termination && status_format == STATUS_FORMAT_LONG)
6f157871 1073 status_format = STATUS_FORMAT_PORCELAIN;
d249b098
JH
1074
1075 wt_status_prepare(&s);
1076 git_config(git_status_config, &s);
30988301 1077 in_merge = file_exists(git_path("MERGE_HEAD"));
76e2f7ce 1078 argc = parse_options(argc, argv, prefix,
9e4b7ab6
JH
1079 builtin_status_options,
1080 builtin_status_usage, 0);
76e2f7ce 1081 handle_untracked_files_arg(&s);
2381e39e
JH
1082 if (show_ignored_in_status)
1083 s.show_ignored_files = 1;
76e2f7ce
JH
1084 if (*argv)
1085 s.pathspec = get_pathspec(prefix, argv);
1086
149794dd 1087 read_cache_preload(s.pathspec);
688cd6d2 1088 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
4bb6644d
MH
1089
1090 fd = hold_locked_index(&index_lock, 0);
1091 if (0 <= fd) {
d5f5d0a9
JH
1092 if (active_cache_changed &&
1093 !write_cache(fd, active_cache, active_nr))
4bb6644d 1094 commit_locked_index(&index_lock);
d5f5d0a9
JH
1095 else
1096 rollback_lock_file(&index_lock);
4bb6644d
MH
1097 }
1098
76e2f7ce 1099 s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
3c588453 1100 s.in_merge = in_merge;
46a958b3 1101 s.ignore_submodule_arg = ignore_submodule_arg;
76e2f7ce
JH
1102 wt_status_collect(&s);
1103
8661768f
JK
1104 if (s.relative_paths)
1105 s.prefix = prefix;
d249b098
JH
1106 if (s.use_color == -1)
1107 s.use_color = git_use_color_default;
38920dd6
MH
1108 if (diff_use_color_default == -1)
1109 diff_use_color_default = git_use_color_default;
1110
dd2be243
JK
1111 switch (status_format) {
1112 case STATUS_FORMAT_SHORT:
05a59a08 1113 wt_shortstatus_print(&s, null_termination, status_show_branch);
dd2be243 1114 break;
6f157871 1115 case STATUS_FORMAT_PORCELAIN:
4a7cc2fd 1116 wt_porcelain_print(&s, null_termination);
6f157871 1117 break;
dd2be243 1118 case STATUS_FORMAT_LONG:
173e6c88 1119 s.verbose = verbose;
46a958b3 1120 s.ignore_submodule_arg = ignore_submodule_arg;
173e6c88 1121 wt_status_print(&s);
dd2be243 1122 break;
173e6c88 1123 }
76e2f7ce 1124 return 0;
f5bbc322
KH
1125}
1126
f5bbc322
KH
1127static void print_summary(const char *prefix, const unsigned char *sha1)
1128{
1129 struct rev_info rev;
1130 struct commit *commit;
49ff9a7a 1131 struct strbuf format = STRBUF_INIT;
c85db254
JK
1132 unsigned char junk_sha1[20];
1133 const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
49ff9a7a
JK
1134 struct pretty_print_context pctx = {0};
1135 struct strbuf author_ident = STRBUF_INIT;
1136 struct strbuf committer_ident = STRBUF_INIT;
f5bbc322
KH
1137
1138 commit = lookup_commit(sha1);
1139 if (!commit)
b5b644a9 1140 die("couldn't look up newly created commit");
f5bbc322
KH
1141 if (!commit || parse_commit(commit))
1142 die("could not parse newly created commit");
1143
49ff9a7a
JK
1144 strbuf_addstr(&format, "format:%h] %s");
1145
1146 format_commit_message(commit, "%an <%ae>", &author_ident, &pctx);
1147 format_commit_message(commit, "%cn <%ce>", &committer_ident, &pctx);
1148 if (strbuf_cmp(&author_ident, &committer_ident)) {
1149 strbuf_addstr(&format, "\n Author: ");
1150 strbuf_addbuf_percentquote(&format, &author_ident);
1151 }
1a893064 1152 if (!user_ident_sufficiently_given()) {
49ff9a7a
JK
1153 strbuf_addstr(&format, "\n Committer: ");
1154 strbuf_addbuf_percentquote(&format, &committer_ident);
b706fcfe
JK
1155 if (advice_implicit_identity) {
1156 strbuf_addch(&format, '\n');
1157 strbuf_addstr(&format, implicit_ident_advice);
1158 }
49ff9a7a
JK
1159 }
1160 strbuf_release(&author_ident);
1161 strbuf_release(&committer_ident);
1162
f5bbc322
KH
1163 init_revisions(&rev, prefix);
1164 setup_revisions(0, NULL, &rev, NULL);
1165
1166 rev.abbrev = 0;
1167 rev.diff = 1;
1168 rev.diffopt.output_format =
1169 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
1170
1171 rev.verbose_header = 1;
1172 rev.show_root_diff = 1;
49ff9a7a 1173 get_commit_format(format.buf, &rev);
bf82a150 1174 rev.always_show_header = 0;
3eb2a15e
JH
1175 rev.diffopt.detect_rename = 1;
1176 rev.diffopt.rename_limit = 100;
1177 rev.diffopt.break_opt = 0;
15964563 1178 diff_setup_done(&rev.diffopt);
f5bbc322 1179
c5ee71fd 1180 printf("[%s%s ",
c85db254
JK
1181 !prefixcmp(head, "refs/heads/") ?
1182 head + 11 :
1183 !strcmp(head, "HEAD") ?
1184 "detached HEAD" :
1185 head,
1186 initial_commit ? " (root-commit)" : "");
f5bbc322 1187
bf82a150 1188 if (!log_tree_commit(&rev, commit)) {
a45e1a87
TRC
1189 rev.always_show_header = 1;
1190 rev.use_terminator = 1;
1191 log_tree_commit(&rev, commit);
bf82a150 1192 }
a45e1a87 1193
fc6f19fe 1194 strbuf_release(&format);
f5bbc322
KH
1195}
1196
186458b1 1197static int git_commit_config(const char *k, const char *v, void *cb)
f5bbc322 1198{
d249b098
JH
1199 struct wt_status *s = cb;
1200
984c6e7e 1201 if (!strcmp(k, "commit.template"))
395de250 1202 return git_config_pathname(&template_file, k, v);
bed575e4
JHI
1203 if (!strcmp(k, "commit.status")) {
1204 include_status = git_config_bool(k, v);
1205 return 0;
1206 }
f5bbc322 1207
d249b098 1208 return git_status_config(k, v, s);
f5bbc322
KH
1209}
1210
6f6bee3b
TR
1211static const char post_rewrite_hook[] = "hooks/post-rewrite";
1212
1213static int run_rewrite_hook(const unsigned char *oldsha1,
1214 const unsigned char *newsha1)
1215{
1216 /* oldsha1 SP newsha1 LF NUL */
1217 static char buf[2*40 + 3];
1218 struct child_process proc;
1219 const char *argv[3];
1220 int code;
1221 size_t n;
1222
1223 if (access(git_path(post_rewrite_hook), X_OK) < 0)
1224 return 0;
1225
1226 argv[0] = git_path(post_rewrite_hook);
1227 argv[1] = "amend";
1228 argv[2] = NULL;
1229
1230 memset(&proc, 0, sizeof(proc));
1231 proc.argv = argv;
1232 proc.in = -1;
1233 proc.stdout_to_stderr = 1;
1234
1235 code = start_command(&proc);
1236 if (code)
1237 return code;
1238 n = snprintf(buf, sizeof(buf), "%s %s\n",
1239 sha1_to_hex(oldsha1), sha1_to_hex(newsha1));
1240 write_in_full(proc.in, buf, n);
1241 close(proc.in);
1242 return finish_command(&proc);
1243}
1244
f5bbc322
KH
1245int cmd_commit(int argc, const char **argv, const char *prefix)
1246{
f285a2d7 1247 struct strbuf sb = STRBUF_INIT;
f5bbc322 1248 const char *index_file, *reflog_msg;
99a12694 1249 char *nl, *p;
f5bbc322
KH
1250 unsigned char commit_sha1[20];
1251 struct ref_lock *ref_lock;
6bb6b034 1252 struct commit_list *parents = NULL, **pptr = &parents;
cf10f9fd
MV
1253 struct stat statbuf;
1254 int allow_fast_forward = 1;
d249b098 1255 struct wt_status s;
f5bbc322 1256
d249b098
JH
1257 wt_status_prepare(&s);
1258 git_config(git_commit_config, &s);
30988301 1259 in_merge = file_exists(git_path("MERGE_HEAD"));
3c588453 1260 s.in_merge = in_merge;
f5bbc322 1261
d249b098
JH
1262 if (s.use_color == -1)
1263 s.use_color = git_use_color_default;
d249b098
JH
1264 argc = parse_and_validate_options(argc, argv, builtin_commit_usage,
1265 prefix, &s);
3fa509df
JH
1266 if (dry_run) {
1267 if (diff_use_color_default == -1)
1268 diff_use_color_default = git_use_color_default;
d249b098 1269 return dry_run_commit(argc, argv, prefix, &s);
3fa509df 1270 }
50b7e70f 1271 index_file = prepare_index(argc, argv, prefix, 0);
f5bbc322 1272
ec84bd00
PB
1273 /* Set up everything for writing the commit object. This includes
1274 running hooks, writing the trees, and interacting with the user. */
d249b098 1275 if (!prepare_to_commit(index_file, prefix, &s)) {
2888605c 1276 rollback_index_files();
f5bbc322
KH
1277 return 1;
1278 }
1279
f5bbc322 1280 /* Determine parents */
643cb5f7 1281 reflog_msg = getenv("GIT_REFLOG_ACTION");
f5bbc322 1282 if (initial_commit) {
643cb5f7
CC
1283 if (!reflog_msg)
1284 reflog_msg = "commit (initial)";
f5bbc322
KH
1285 } else if (amend) {
1286 struct commit_list *c;
1287 struct commit *commit;
1288
643cb5f7
CC
1289 if (!reflog_msg)
1290 reflog_msg = "commit (amend)";
f5bbc322
KH
1291 commit = lookup_commit(head_sha1);
1292 if (!commit || parse_commit(commit))
1293 die("could not parse HEAD commit");
1294
1295 for (c = commit->parents; c; c = c->next)
6bb6b034 1296 pptr = &commit_list_insert(c->item, pptr)->next;
f5bbc322 1297 } else if (in_merge) {
f285a2d7 1298 struct strbuf m = STRBUF_INIT;
f5bbc322
KH
1299 FILE *fp;
1300
643cb5f7
CC
1301 if (!reflog_msg)
1302 reflog_msg = "commit (merge)";
6bb6b034 1303 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
f5bbc322
KH
1304 fp = fopen(git_path("MERGE_HEAD"), "r");
1305 if (fp == NULL)
d824cbba
TR
1306 die_errno("could not open '%s' for reading",
1307 git_path("MERGE_HEAD"));
7c3fd25d
LT
1308 while (strbuf_getline(&m, fp, '\n') != EOF) {
1309 unsigned char sha1[20];
1310 if (get_sha1_hex(m.buf, sha1) < 0)
1311 die("Corrupt MERGE_HEAD file (%s)", m.buf);
6bb6b034 1312 pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
7c3fd25d 1313 }
f5bbc322
KH
1314 fclose(fp);
1315 strbuf_release(&m);
cf10f9fd
MV
1316 if (!stat(git_path("MERGE_MODE"), &statbuf)) {
1317 if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
d824cbba 1318 die_errno("could not read MERGE_MODE");
cf10f9fd
MV
1319 if (!strcmp(sb.buf, "no-ff"))
1320 allow_fast_forward = 0;
1321 }
1322 if (allow_fast_forward)
1323 parents = reduce_heads(parents);
f5bbc322 1324 } else {
643cb5f7
CC
1325 if (!reflog_msg)
1326 reflog_msg = "commit";
6bb6b034 1327 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
f5bbc322 1328 }
f5bbc322 1329
ec84bd00 1330 /* Finally, get the commit message */
cf10f9fd 1331 strbuf_reset(&sb);
740001a5 1332 if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
0721c314 1333 int saved_errno = errno;
740001a5 1334 rollback_index_files();
0721c314 1335 die("could not read commit message: %s", strerror(saved_errno));
740001a5 1336 }
99a12694
KH
1337
1338 /* Truncate the message just before the diff, if any. */
0b38227f
JK
1339 if (verbose) {
1340 p = strstr(sb.buf, "\ndiff --git ");
1341 if (p != NULL)
1342 strbuf_setlen(&sb, p - sb.buf + 1);
1343 }
99a12694 1344
5f065737
AR
1345 if (cleanup_mode != CLEANUP_NONE)
1346 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
c9b5fde7 1347 if (message_is_empty(&sb) && !allow_empty_message) {
2888605c 1348 rollback_index_files();
fdc7c811
JK
1349 fprintf(stderr, "Aborting commit due to empty commit message.\n");
1350 exit(1);
2888605c 1351 }
f5bbc322 1352
6bb6b034
MV
1353 if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
1354 fmt_ident(author_name, author_email, author_date,
1355 IDENT_ERROR_ON_NO_NAME))) {
2888605c 1356 rollback_index_files();
f5bbc322 1357 die("failed to write commit object");
2888605c 1358 }
f5bbc322
KH
1359
1360 ref_lock = lock_any_ref_for_update("HEAD",
1361 initial_commit ? NULL : head_sha1,
1362 0);
1363
6bb6b034 1364 nl = strchr(sb.buf, '\n');
741707b1
JS
1365 if (nl)
1366 strbuf_setlen(&sb, nl + 1 - sb.buf);
1367 else
1368 strbuf_addch(&sb, '\n');
741707b1
JS
1369 strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1370 strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
f5bbc322 1371
2888605c
JH
1372 if (!ref_lock) {
1373 rollback_index_files();
f5bbc322 1374 die("cannot lock HEAD ref");
2888605c
JH
1375 }
1376 if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1377 rollback_index_files();
f5bbc322 1378 die("cannot update HEAD ref");
2888605c 1379 }
f5bbc322
KH
1380
1381 unlink(git_path("MERGE_HEAD"));
1382 unlink(git_path("MERGE_MSG"));
cf10f9fd 1383 unlink(git_path("MERGE_MODE"));
5a95b855 1384 unlink(git_path("SQUASH_MSG"));
f5bbc322 1385
5a9dd399
BC
1386 if (commit_index_files())
1387 die ("Repository has been updated, but unable to write\n"
1388 "new_index file. Check that disk is not full or quota is\n"
1389 "not exceeded, and then \"git reset HEAD\" to recover.");
f5bbc322 1390
cb6020bb 1391 rerere(0);
2888605c 1392 run_hook(get_index_file(), "post-commit", NULL);
6f6bee3b 1393 if (amend && !no_post_rewrite) {
6360d343
TR
1394 struct notes_rewrite_cfg *cfg;
1395 cfg = init_copy_notes_for_rewrite("amend");
1396 if (cfg) {
1397 copy_note_for_rewrite(cfg, head_sha1, commit_sha1);
1398 finish_copy_notes_for_rewrite(cfg);
1399 }
6f6bee3b
TR
1400 run_rewrite_hook(head_sha1, commit_sha1);
1401 }
f5bbc322
KH
1402 if (!quiet)
1403 print_summary(prefix, commit_sha1);
1404
1405 return 0;
1406}