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