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