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