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