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