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 "dir.h"
11#include "builtin.h"
12#include "diff.h"
13#include "diffcore.h"
14#include "commit.h"
15#include "revision.h"
16#include "wt-status.h"
17#include "run-command.h"
18#include "refs.h"
19#include "log-tree.h"
20#include "strbuf.h"
21#include "utf8.h"
22#include "parse-options.h"
23#include "path-list.h"
24#include "unpack-trees.h"
25
26static const char * const builtin_commit_usage[] = {
27 "git-commit [options] [--] <filepattern>...",
28 NULL
29};
30
31static const char * const builtin_status_usage[] = {
32 "git-status [options] [--] <filepattern>...",
33 NULL
34};
35
36static unsigned char head_sha1[20], merge_head_sha1[20];
37static char *use_message_buffer;
38static const char commit_editmsg[] = "COMMIT_EDITMSG";
39static struct lock_file index_lock; /* real index */
40static struct lock_file false_lock; /* used only for partial commits */
41static enum {
42 COMMIT_AS_IS = 1,
43 COMMIT_NORMAL,
44 COMMIT_PARTIAL,
45} commit_style;
46
47static char *logfile, *force_author, *template_file;
48static char *edit_message, *use_message;
49static int all, edit_flag, also, interactive, only, amend, signoff;
50static int quiet, verbose, untracked_files, no_verify, allow_empty;
51/*
52 * The default commit message cleanup mode will remove the lines
53 * beginning with # (shell comments) and leading and trailing
54 * whitespaces (empty lines or containing only whitespaces)
55 * if editor is used, and only the whitespaces if the message
56 * is specified explicitly.
57 */
58static enum {
59 CLEANUP_SPACE,
60 CLEANUP_NONE,
61 CLEANUP_ALL,
62} cleanup_mode;
63static char *cleanup_arg;
64
65static int use_editor = 1, initial_commit, in_merge;
66const char *only_include_assumed;
67struct strbuf message;
68
69static int opt_parse_m(const struct option *opt, const char *arg, int unset)
70{
71 struct strbuf *buf = opt->value;
72 if (unset)
73 strbuf_setlen(buf, 0);
74 else {
75 strbuf_addstr(buf, arg);
76 strbuf_addch(buf, '\n');
77 strbuf_addch(buf, '\n');
78 }
79 return 0;
80}
81
82static struct option builtin_commit_options[] = {
83 OPT__QUIET(&quiet),
84 OPT__VERBOSE(&verbose),
85 OPT_GROUP("Commit message options"),
86
87 OPT_STRING('F', "file", &logfile, "FILE", "read log from file"),
88 OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
89 OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
90 OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
91 OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
92 OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"),
93 OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"),
94 OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
95
96 OPT_GROUP("Commit contents options"),
97 OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
98 OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
99 OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
100 OPT_BOOLEAN('o', "only", &only, ""),
101 OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
102 OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
103 OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"),
104 OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
105 OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
106
107 OPT_END()
108};
109
110static void rollback_index_files(void)
111{
112 switch (commit_style) {
113 case COMMIT_AS_IS:
114 break; /* nothing to do */
115 case COMMIT_NORMAL:
116 rollback_lock_file(&index_lock);
117 break;
118 case COMMIT_PARTIAL:
119 rollback_lock_file(&index_lock);
120 rollback_lock_file(&false_lock);
121 break;
122 }
123}
124
125static int commit_index_files(void)
126{
127 int err = 0;
128
129 switch (commit_style) {
130 case COMMIT_AS_IS:
131 break; /* nothing to do */
132 case COMMIT_NORMAL:
133 err = commit_lock_file(&index_lock);
134 break;
135 case COMMIT_PARTIAL:
136 err = commit_lock_file(&index_lock);
137 rollback_lock_file(&false_lock);
138 break;
139 }
140
141 return err;
142}
143
144/*
145 * Take a union of paths in the index and the named tree (typically, "HEAD"),
146 * and return the paths that match the given pattern in list.
147 */
148static int list_paths(struct path_list *list, const char *with_tree,
149 const char *prefix, const char **pattern)
150{
151 int i;
152 char *m;
153
154 for (i = 0; pattern[i]; i++)
155 ;
156 m = xcalloc(1, i);
157
158 if (with_tree)
159 overlay_tree_on_cache(with_tree, prefix);
160
161 for (i = 0; i < active_nr; i++) {
162 struct cache_entry *ce = active_cache[i];
163 if (ce->ce_flags & htons(CE_UPDATE))
164 continue;
165 if (!pathspec_match(pattern, m, ce->name, 0))
166 continue;
167 path_list_insert(ce->name, list);
168 }
169
170 return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
171}
172
173static void add_remove_files(struct path_list *list)
174{
175 int i;
176 for (i = 0; i < list->nr; i++) {
177 struct path_list_item *p = &(list->items[i]);
178 if (file_exists(p->path))
179 add_file_to_cache(p->path, 0);
180 else
181 remove_file_from_cache(p->path);
182 }
183}
184
185static void create_base_index(void)
186{
187 struct tree *tree;
188 struct unpack_trees_options opts;
189 struct tree_desc t;
190
191 if (initial_commit) {
192 discard_cache();
193 return;
194 }
195
196 memset(&opts, 0, sizeof(opts));
197 opts.head_idx = 1;
198 opts.index_only = 1;
199 opts.merge = 1;
200
201 opts.fn = oneway_merge;
202 tree = parse_tree_indirect(head_sha1);
203 if (!tree)
204 die("failed to unpack HEAD tree object");
205 parse_tree(tree);
206 init_tree_desc(&t, tree->buffer, tree->size);
207 unpack_trees(1, &t, &opts);
208}
209
210static char *prepare_index(int argc, const char **argv, const char *prefix)
211{
212 int fd;
213 struct path_list partial;
214 const char **pathspec = NULL;
215
216 if (interactive) {
217 interactive_add(argc, argv, prefix);
218 commit_style = COMMIT_AS_IS;
219 return get_index_file();
220 }
221
222 if (read_cache() < 0)
223 die("index file corrupt");
224
225 if (*argv)
226 pathspec = get_pathspec(prefix, argv);
227
228 /*
229 * Non partial, non as-is commit.
230 *
231 * (1) get the real index;
232 * (2) update the_index as necessary;
233 * (3) write the_index out to the real index (still locked);
234 * (4) return the name of the locked index file.
235 *
236 * The caller should run hooks on the locked real index, and
237 * (A) if all goes well, commit the real index;
238 * (B) on failure, rollback the real index.
239 */
240 if (all || (also && pathspec && *pathspec)) {
241 int fd = hold_locked_index(&index_lock, 1);
242 add_files_to_cache(0, also ? prefix : NULL, pathspec);
243 refresh_cache(REFRESH_QUIET);
244 if (write_cache(fd, active_cache, active_nr) ||
245 close_lock_file(&index_lock))
246 die("unable to write new_index file");
247 commit_style = COMMIT_NORMAL;
248 return index_lock.filename;
249 }
250
251 /*
252 * As-is commit.
253 *
254 * (1) return the name of the real index file.
255 *
256 * The caller should run hooks on the real index, and run
257 * hooks on the real index, and create commit from the_index.
258 * We still need to refresh the index here.
259 */
260 if (!pathspec || !*pathspec) {
261 fd = hold_locked_index(&index_lock, 1);
262 refresh_cache(REFRESH_QUIET);
263 if (write_cache(fd, active_cache, active_nr) ||
264 commit_locked_index(&index_lock))
265 die("unable to write new_index file");
266 commit_style = COMMIT_AS_IS;
267 return get_index_file();
268 }
269
270 /*
271 * A partial commit.
272 *
273 * (0) find the set of affected paths;
274 * (1) get lock on the real index file;
275 * (2) update the_index with the given paths;
276 * (3) write the_index out to the real index (still locked);
277 * (4) get lock on the false index file;
278 * (5) reset the_index from HEAD;
279 * (6) update the_index the same way as (2);
280 * (7) write the_index out to the false index file;
281 * (8) return the name of the false index file (still locked);
282 *
283 * The caller should run hooks on the locked false index, and
284 * create commit from it. Then
285 * (A) if all goes well, commit the real index;
286 * (B) on failure, rollback the real index;
287 * In either case, rollback the false index.
288 */
289 commit_style = COMMIT_PARTIAL;
290
291 if (file_exists(git_path("MERGE_HEAD")))
292 die("cannot do a partial commit during a merge.");
293
294 memset(&partial, 0, sizeof(partial));
295 partial.strdup_paths = 1;
296 if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
297 exit(1);
298
299 discard_cache();
300 if (read_cache() < 0)
301 die("cannot read the index");
302
303 fd = hold_locked_index(&index_lock, 1);
304 add_remove_files(&partial);
305 refresh_cache(REFRESH_QUIET);
306 if (write_cache(fd, active_cache, active_nr) ||
307 close_lock_file(&index_lock))
308 die("unable to write new_index file");
309
310 fd = hold_lock_file_for_update(&false_lock,
311 git_path("next-index-%d", getpid()), 1);
312
313 create_base_index();
314 add_remove_files(&partial);
315 refresh_cache(REFRESH_QUIET);
316
317 if (write_cache(fd, active_cache, active_nr) ||
318 close_lock_file(&false_lock))
319 die("unable to write temporary index file");
320
321 discard_cache();
322 read_cache_from(false_lock.filename);
323
324 return false_lock.filename;
325}
326
327static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn)
328{
329 struct wt_status s;
330
331 wt_status_prepare(&s);
332 if (wt_status_relative_paths)
333 s.prefix = prefix;
334
335 if (amend) {
336 s.amend = 1;
337 s.reference = "HEAD^1";
338 }
339 s.verbose = verbose;
340 s.untracked = untracked_files;
341 s.index_file = index_file;
342 s.fp = fp;
343 s.nowarn = nowarn;
344
345 wt_status_print(&s);
346
347 return s.commitable;
348}
349
350static const char sign_off_header[] = "Signed-off-by: ";
351
352static int prepare_log_message(const char *index_file, const char *prefix)
353{
354 struct stat statbuf;
355 int commitable, saved_color_setting;
356 struct strbuf sb;
357 char *buffer;
358 FILE *fp;
359
360 strbuf_init(&sb, 0);
361 if (message.len) {
362 strbuf_addbuf(&sb, &message);
363 } else if (logfile && !strcmp(logfile, "-")) {
364 if (isatty(0))
365 fprintf(stderr, "(reading log message from standard input)\n");
366 if (strbuf_read(&sb, 0, 0) < 0)
367 die("could not read log from standard input");
368 } else if (logfile) {
369 if (strbuf_read_file(&sb, logfile, 0) < 0)
370 die("could not read log file '%s': %s",
371 logfile, strerror(errno));
372 } else if (use_message) {
373 buffer = strstr(use_message_buffer, "\n\n");
374 if (!buffer || buffer[2] == '\0')
375 die("commit has empty message");
376 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
377 } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
378 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
379 die("could not read MERGE_MSG: %s", strerror(errno));
380 } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
381 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
382 die("could not read SQUASH_MSG: %s", strerror(errno));
383 } else if (template_file && !stat(template_file, &statbuf)) {
384 if (strbuf_read_file(&sb, template_file, 0) < 0)
385 die("could not read %s: %s",
386 template_file, strerror(errno));
387 }
388
389 fp = fopen(git_path(commit_editmsg), "w");
390 if (fp == NULL)
391 die("could not open %s", git_path(commit_editmsg));
392
393 if (cleanup_mode != CLEANUP_NONE)
394 stripspace(&sb, 0);
395
396 if (signoff) {
397 struct strbuf sob;
398 int i;
399
400 strbuf_init(&sob, 0);
401 strbuf_addstr(&sob, sign_off_header);
402 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
403 getenv("GIT_COMMITTER_EMAIL")));
404 strbuf_addch(&sob, '\n');
405 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
406 ; /* do nothing */
407 if (prefixcmp(sb.buf + i, sob.buf)) {
408 if (prefixcmp(sb.buf + i, sign_off_header))
409 strbuf_addch(&sb, '\n');
410 strbuf_addbuf(&sb, &sob);
411 }
412 strbuf_release(&sob);
413 }
414
415 if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
416 die("could not write commit template: %s", strerror(errno));
417
418 strbuf_release(&sb);
419
420 if (!use_editor) {
421 struct rev_info rev;
422 unsigned char sha1[20];
423 const char *parent = "HEAD";
424
425 fclose(fp);
426
427 if (!active_nr && read_cache() < 0)
428 die("Cannot read index");
429
430 if (amend)
431 parent = "HEAD^1";
432
433 if (get_sha1(parent, sha1))
434 return !!active_nr;
435
436 init_revisions(&rev, "");
437 rev.abbrev = 0;
438 setup_revisions(0, NULL, &rev, parent);
439 DIFF_OPT_SET(&rev.diffopt, QUIET);
440 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
441 run_diff_index(&rev, 1 /* cached */);
442
443 return !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
444 }
445
446 if (in_merge)
447 fprintf(fp,
448 "#\n"
449 "# It looks like you may be committing a MERGE.\n"
450 "# If this is not correct, please remove the file\n"
451 "# %s\n"
452 "# and try again.\n"
453 "#\n",
454 git_path("MERGE_HEAD"));
455
456 fprintf(fp,
457 "\n"
458 "# Please enter the commit message for your changes.\n"
459 "# (Comment lines starting with '#' will ");
460 if (cleanup_mode == CLEANUP_ALL)
461 fprintf(fp, "not be included)\n");
462 else /* CLEANUP_SPACE, that is. */
463 fprintf(fp, "be kept.\n"
464 "# You can remove them yourself if you want to)\n");
465 if (only_include_assumed)
466 fprintf(fp, "# %s\n", only_include_assumed);
467
468 saved_color_setting = wt_status_use_color;
469 wt_status_use_color = 0;
470 commitable = run_status(fp, index_file, prefix, 1);
471 wt_status_use_color = saved_color_setting;
472
473 fclose(fp);
474
475 return commitable;
476}
477
478/*
479 * Find out if the message starting at position 'start' in the strbuf
480 * contains only whitespace and Signed-off-by lines.
481 */
482static int message_is_empty(struct strbuf *sb, int start)
483{
484 struct strbuf tmpl;
485 const char *nl;
486 int eol, i;
487
488 if (cleanup_mode == CLEANUP_NONE && sb->len)
489 return 0;
490
491 /* See if the template is just a prefix of the message. */
492 strbuf_init(&tmpl, 0);
493 if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
494 stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
495 if (start + tmpl.len <= sb->len &&
496 memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
497 start += tmpl.len;
498 }
499 strbuf_release(&tmpl);
500
501 /* Check if the rest is just whitespace and Signed-of-by's. */
502 for (i = start; i < sb->len; i++) {
503 nl = memchr(sb->buf + i, '\n', sb->len - i);
504 if (nl)
505 eol = nl - sb->buf;
506 else
507 eol = sb->len;
508
509 if (strlen(sign_off_header) <= eol - i &&
510 !prefixcmp(sb->buf + i, sign_off_header)) {
511 i = eol;
512 continue;
513 }
514 while (i < eol)
515 if (!isspace(sb->buf[i++]))
516 return 0;
517 }
518
519 return 1;
520}
521
522static void determine_author_info(struct strbuf *sb)
523{
524 char *name, *email, *date;
525
526 name = getenv("GIT_AUTHOR_NAME");
527 email = getenv("GIT_AUTHOR_EMAIL");
528 date = getenv("GIT_AUTHOR_DATE");
529
530 if (use_message) {
531 const char *a, *lb, *rb, *eol;
532
533 a = strstr(use_message_buffer, "\nauthor ");
534 if (!a)
535 die("invalid commit: %s", use_message);
536
537 lb = strstr(a + 8, " <");
538 rb = strstr(a + 8, "> ");
539 eol = strchr(a + 8, '\n');
540 if (!lb || !rb || !eol)
541 die("invalid commit: %s", use_message);
542
543 name = xstrndup(a + 8, lb - (a + 8));
544 email = xstrndup(lb + 2, rb - (lb + 2));
545 date = xstrndup(rb + 2, eol - (rb + 2));
546 }
547
548 if (force_author) {
549 const char *lb = strstr(force_author, " <");
550 const char *rb = strchr(force_author, '>');
551
552 if (!lb || !rb)
553 die("malformed --author parameter");
554 name = xstrndup(force_author, lb - force_author);
555 email = xstrndup(lb + 2, rb - (lb + 2));
556 }
557
558 strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
559}
560
561static int parse_and_validate_options(int argc, const char *argv[],
562 const char * const usage[])
563{
564 int f = 0;
565
566 argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
567
568 if (logfile || message.len || use_message)
569 use_editor = 0;
570 if (edit_flag)
571 use_editor = 1;
572
573 if (get_sha1("HEAD", head_sha1))
574 initial_commit = 1;
575
576 if (!get_sha1("MERGE_HEAD", merge_head_sha1))
577 in_merge = 1;
578
579 /* Sanity check options */
580 if (amend && initial_commit)
581 die("You have nothing to amend.");
582 if (amend && in_merge)
583 die("You are in the middle of a merge -- cannot amend.");
584
585 if (use_message)
586 f++;
587 if (edit_message)
588 f++;
589 if (logfile)
590 f++;
591 if (f > 1)
592 die("Only one of -c/-C/-F can be used.");
593 if (message.len && f > 0)
594 die("Option -m cannot be combined with -c/-C/-F.");
595 if (edit_message)
596 use_message = edit_message;
597 if (amend && !use_message)
598 use_message = "HEAD";
599 if (use_message) {
600 unsigned char sha1[20];
601 static char utf8[] = "UTF-8";
602 const char *out_enc;
603 char *enc, *end;
604 struct commit *commit;
605
606 if (get_sha1(use_message, sha1))
607 die("could not lookup commit %s", use_message);
608 commit = lookup_commit_reference(sha1);
609 if (!commit || parse_commit(commit))
610 die("could not parse commit %s", use_message);
611
612 enc = strstr(commit->buffer, "\nencoding");
613 if (enc) {
614 end = strchr(enc + 10, '\n');
615 enc = xstrndup(enc + 10, end - (enc + 10));
616 } else {
617 enc = utf8;
618 }
619 out_enc = git_commit_encoding ? git_commit_encoding : utf8;
620
621 if (strcmp(out_enc, enc))
622 use_message_buffer =
623 reencode_string(commit->buffer, out_enc, enc);
624
625 /*
626 * If we failed to reencode the buffer, just copy it
627 * byte for byte so the user can try to fix it up.
628 * This also handles the case where input and output
629 * encodings are identical.
630 */
631 if (use_message_buffer == NULL)
632 use_message_buffer = xstrdup(commit->buffer);
633 if (enc != utf8)
634 free(enc);
635 }
636
637 if (!!also + !!only + !!all + !!interactive > 1)
638 die("Only one of --include/--only/--all/--interactive can be used.");
639 if (argc == 0 && (also || (only && !amend)))
640 die("No paths with --include/--only does not make sense.");
641 if (argc == 0 && only && amend)
642 only_include_assumed = "Clever... amending the last one with dirty index.";
643 if (argc > 0 && !also && !only) {
644 only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
645 also = 0;
646 }
647 if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
648 cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
649 else if (!strcmp(cleanup_arg, "verbatim"))
650 cleanup_mode = CLEANUP_NONE;
651 else if (!strcmp(cleanup_arg, "whitespace"))
652 cleanup_mode = CLEANUP_SPACE;
653 else if (!strcmp(cleanup_arg, "strip"))
654 cleanup_mode = CLEANUP_ALL;
655 else
656 die("Invalid cleanup mode %s", cleanup_arg);
657
658 if (all && argc > 0)
659 die("Paths with -a does not make sense.");
660 else if (interactive && argc > 0)
661 die("Paths with --interactive does not make sense.");
662
663 return argc;
664}
665
666int cmd_status(int argc, const char **argv, const char *prefix)
667{
668 const char *index_file;
669 int commitable;
670
671 git_config(git_status_config);
672
673 argc = parse_and_validate_options(argc, argv, builtin_status_usage);
674
675 index_file = prepare_index(argc, argv, prefix);
676
677 commitable = run_status(stdout, index_file, prefix, 0);
678
679 rollback_index_files();
680
681 return commitable ? 0 : 1;
682}
683
684static int run_hook(const char *index_file, const char *name, const char *arg)
685{
686 struct child_process hook;
687 const char *argv[3], *env[2];
688 char index[PATH_MAX];
689
690 argv[0] = git_path("hooks/%s", name);
691 argv[1] = arg;
692 argv[2] = NULL;
693 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
694 env[0] = index;
695 env[1] = NULL;
696
697 if (access(argv[0], X_OK) < 0)
698 return 0;
699
700 memset(&hook, 0, sizeof(hook));
701 hook.argv = argv;
702 hook.no_stdin = 1;
703 hook.stdout_to_stderr = 1;
704 hook.env = env;
705
706 return run_command(&hook);
707}
708
709static void print_summary(const char *prefix, const unsigned char *sha1)
710{
711 struct rev_info rev;
712 struct commit *commit;
713
714 commit = lookup_commit(sha1);
715 if (!commit)
716 die("couldn't look up newly created commit");
717 if (!commit || parse_commit(commit))
718 die("could not parse newly created commit");
719
720 init_revisions(&rev, prefix);
721 setup_revisions(0, NULL, &rev, NULL);
722
723 rev.abbrev = 0;
724 rev.diff = 1;
725 rev.diffopt.output_format =
726 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
727
728 rev.verbose_header = 1;
729 rev.show_root_diff = 1;
730 rev.commit_format = get_commit_format("format:%h: %s");
731 rev.always_show_header = 0;
732 rev.diffopt.detect_rename = 1;
733 rev.diffopt.rename_limit = 100;
734 rev.diffopt.break_opt = 0;
735 diff_setup_done(&rev.diffopt);
736
737 printf("Created %scommit ", initial_commit ? "initial " : "");
738
739 if (!log_tree_commit(&rev, commit)) {
740 struct strbuf buf = STRBUF_INIT;
741 format_commit_message(commit, "%h: %s", &buf);
742 printf("%s\n", buf.buf);
743 strbuf_release(&buf);
744 }
745}
746
747int git_commit_config(const char *k, const char *v)
748{
749 if (!strcmp(k, "commit.template")) {
750 if (!v)
751 return config_error_nonbool(v);
752 template_file = xstrdup(v);
753 return 0;
754 }
755
756 return git_status_config(k, v);
757}
758
759static int is_a_merge(const unsigned char *sha1)
760{
761 struct commit *commit = lookup_commit(sha1);
762 if (!commit || parse_commit(commit))
763 die("could not parse HEAD commit");
764 return !!(commit->parents && commit->parents->next);
765}
766
767static const char commit_utf8_warn[] =
768"Warning: commit message does not conform to UTF-8.\n"
769"You may want to amend it after fixing the message, or set the config\n"
770"variable i18n.commitencoding to the encoding your project uses.\n";
771
772static void add_parent(struct strbuf *sb, const unsigned char *sha1)
773{
774 struct object *obj = parse_object(sha1);
775 const char *parent = sha1_to_hex(sha1);
776 if (!obj)
777 die("Unable to find commit parent %s", parent);
778 if (obj->type != OBJ_COMMIT)
779 die("Parent %s isn't a proper commit", parent);
780 strbuf_addf(sb, "parent %s\n", parent);
781}
782
783int cmd_commit(int argc, const char **argv, const char *prefix)
784{
785 int header_len;
786 struct strbuf sb;
787 const char *index_file, *reflog_msg;
788 char *nl, *p;
789 unsigned char commit_sha1[20];
790 struct ref_lock *ref_lock;
791
792 git_config(git_commit_config);
793
794 argc = parse_and_validate_options(argc, argv, builtin_commit_usage);
795
796 index_file = prepare_index(argc, argv, prefix);
797
798 if (!no_verify && run_hook(index_file, "pre-commit", NULL)) {
799 rollback_index_files();
800 return 1;
801 }
802
803 if (!prepare_log_message(index_file, prefix) && !in_merge &&
804 !allow_empty && !(amend && is_a_merge(head_sha1))) {
805 run_status(stdout, index_file, prefix, 0);
806 rollback_index_files();
807 unlink(commit_editmsg);
808 return 1;
809 }
810
811 /*
812 * Re-read the index as pre-commit hook could have updated it,
813 * and write it out as a tree.
814 */
815 discard_cache();
816 read_cache_from(index_file);
817 if (!active_cache_tree)
818 active_cache_tree = cache_tree();
819 if (cache_tree_update(active_cache_tree,
820 active_cache, active_nr, 0, 0) < 0) {
821 rollback_index_files();
822 die("Error building trees");
823 }
824
825 /*
826 * The commit object
827 */
828 strbuf_init(&sb, 0);
829 strbuf_addf(&sb, "tree %s\n",
830 sha1_to_hex(active_cache_tree->sha1));
831
832 /* Determine parents */
833 if (initial_commit) {
834 reflog_msg = "commit (initial)";
835 } else if (amend) {
836 struct commit_list *c;
837 struct commit *commit;
838
839 reflog_msg = "commit (amend)";
840 commit = lookup_commit(head_sha1);
841 if (!commit || parse_commit(commit))
842 die("could not parse HEAD commit");
843
844 for (c = commit->parents; c; c = c->next)
845 add_parent(&sb, c->item->object.sha1);
846 } else if (in_merge) {
847 struct strbuf m;
848 FILE *fp;
849
850 reflog_msg = "commit (merge)";
851 add_parent(&sb, head_sha1);
852 strbuf_init(&m, 0);
853 fp = fopen(git_path("MERGE_HEAD"), "r");
854 if (fp == NULL)
855 die("could not open %s for reading: %s",
856 git_path("MERGE_HEAD"), strerror(errno));
857 while (strbuf_getline(&m, fp, '\n') != EOF) {
858 unsigned char sha1[20];
859 if (get_sha1_hex(m.buf, sha1) < 0)
860 die("Corrupt MERGE_HEAD file (%s)", m.buf);
861 add_parent(&sb, sha1);
862 }
863 fclose(fp);
864 strbuf_release(&m);
865 } else {
866 reflog_msg = "commit";
867 strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
868 }
869
870 determine_author_info(&sb);
871 strbuf_addf(&sb, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
872 if (!is_encoding_utf8(git_commit_encoding))
873 strbuf_addf(&sb, "encoding %s\n", git_commit_encoding);
874 strbuf_addch(&sb, '\n');
875
876 /* Get the commit message and validate it */
877 header_len = sb.len;
878 if (use_editor) {
879 char index[PATH_MAX];
880 const char *env[2] = { index, NULL };
881 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
882 launch_editor(git_path(commit_editmsg), NULL, env);
883 }
884 if (!no_verify &&
885 run_hook(index_file, "commit-msg", git_path(commit_editmsg))) {
886 rollback_index_files();
887 exit(1);
888 }
889 if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
890 rollback_index_files();
891 die("could not read commit message");
892 }
893
894 /* Truncate the message just before the diff, if any. */
895 p = strstr(sb.buf, "\ndiff --git a/");
896 if (p != NULL)
897 strbuf_setlen(&sb, p - sb.buf + 1);
898
899 if (cleanup_mode != CLEANUP_NONE)
900 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
901 if (sb.len < header_len || message_is_empty(&sb, header_len)) {
902 rollback_index_files();
903 die("no commit message? aborting commit.");
904 }
905 strbuf_addch(&sb, '\0');
906 if (is_encoding_utf8(git_commit_encoding) && !is_utf8(sb.buf))
907 fprintf(stderr, commit_utf8_warn);
908
909 if (write_sha1_file(sb.buf, sb.len - 1, commit_type, commit_sha1)) {
910 rollback_index_files();
911 die("failed to write commit object");
912 }
913
914 ref_lock = lock_any_ref_for_update("HEAD",
915 initial_commit ? NULL : head_sha1,
916 0);
917
918 nl = strchr(sb.buf + header_len, '\n');
919 if (nl)
920 strbuf_setlen(&sb, nl + 1 - sb.buf);
921 else
922 strbuf_addch(&sb, '\n');
923 strbuf_remove(&sb, 0, header_len);
924 strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
925 strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
926
927 if (!ref_lock) {
928 rollback_index_files();
929 die("cannot lock HEAD ref");
930 }
931 if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
932 rollback_index_files();
933 die("cannot update HEAD ref");
934 }
935
936 unlink(git_path("MERGE_HEAD"));
937 unlink(git_path("MERGE_MSG"));
938 unlink(git_path("SQUASH_MSG"));
939
940 if (commit_index_files())
941 die ("Repository has been updated, but unable to write\n"
942 "new_index file. Check that disk is not full or quota is\n"
943 "not exceeded, and then \"git reset HEAD\" to recover.");
944
945 rerere();
946 run_hook(get_index_file(), "post-commit", NULL);
947 if (!quiet)
948 print_summary(prefix, commit_sha1);
949
950 return 0;
951}