Merge branch 'maint-1.6.0' into maint-1.6.1
[git/git.git] / builtin-commit.c
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
28 static const char * const builtin_commit_usage[] = {
29 "git commit [options] [--] <filepattern>...",
30 NULL
31 };
32
33 static const char * const builtin_status_usage[] = {
34 "git status [options] [--] <filepattern>...",
35 NULL
36 };
37
38 static unsigned char head_sha1[20], merge_head_sha1[20];
39 static char *use_message_buffer;
40 static const char commit_editmsg[] = "COMMIT_EDITMSG";
41 static struct lock_file index_lock; /* real index */
42 static struct lock_file false_lock; /* used only for partial commits */
43 static enum {
44 COMMIT_AS_IS = 1,
45 COMMIT_NORMAL,
46 COMMIT_PARTIAL,
47 } commit_style;
48
49 static const char *logfile, *force_author;
50 static const char *template_file;
51 static char *edit_message, *use_message;
52 static char *author_name, *author_email, *author_date;
53 static int all, edit_flag, also, interactive, only, amend, signoff;
54 static int quiet, verbose, no_verify, allow_empty;
55 static 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 */
63 static enum {
64 CLEANUP_SPACE,
65 CLEANUP_NONE,
66 CLEANUP_ALL,
67 } cleanup_mode;
68 static char *cleanup_arg;
69
70 static int use_editor = 1, initial_commit, in_merge;
71 static const char *only_include_assumed;
72 static struct strbuf message;
73
74 static 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
86 static 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
114 static 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
129 static 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 */
152 static 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
177 static 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
192 static 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
220 static 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 if (interactive_add(argc, argv, prefix) != 0)
228 die("interactive add failed");
229 if (read_cache_preload(NULL) < 0)
230 die("index file corrupt");
231 commit_style = COMMIT_AS_IS;
232 return get_index_file();
233 }
234
235 if (*argv)
236 pathspec = get_pathspec(prefix, argv);
237
238 if (read_cache_preload(pathspec) < 0)
239 die("index file corrupt");
240
241 /*
242 * Non partial, non as-is commit.
243 *
244 * (1) get the real index;
245 * (2) update the_index as necessary;
246 * (3) write the_index out to the real index (still locked);
247 * (4) return the name of the locked index file.
248 *
249 * The caller should run hooks on the locked real index, and
250 * (A) if all goes well, commit the real index;
251 * (B) on failure, rollback the real index.
252 */
253 if (all || (also && pathspec && *pathspec)) {
254 int fd = hold_locked_index(&index_lock, 1);
255 add_files_to_cache(also ? prefix : NULL, pathspec, 0);
256 refresh_cache(REFRESH_QUIET);
257 if (write_cache(fd, active_cache, active_nr) ||
258 close_lock_file(&index_lock))
259 die("unable to write new_index file");
260 commit_style = COMMIT_NORMAL;
261 return index_lock.filename;
262 }
263
264 /*
265 * As-is commit.
266 *
267 * (1) return the name of the real index file.
268 *
269 * The caller should run hooks on the real index, and run
270 * hooks on the real index, and create commit from the_index.
271 * We still need to refresh the index here.
272 */
273 if (!pathspec || !*pathspec) {
274 fd = hold_locked_index(&index_lock, 1);
275 refresh_cache(REFRESH_QUIET);
276 if (write_cache(fd, active_cache, active_nr) ||
277 commit_locked_index(&index_lock))
278 die("unable to write new_index file");
279 commit_style = COMMIT_AS_IS;
280 return get_index_file();
281 }
282
283 /*
284 * A partial commit.
285 *
286 * (0) find the set of affected paths;
287 * (1) get lock on the real index file;
288 * (2) update the_index with the given paths;
289 * (3) write the_index out to the real index (still locked);
290 * (4) get lock on the false index file;
291 * (5) reset the_index from HEAD;
292 * (6) update the_index the same way as (2);
293 * (7) write the_index out to the false index file;
294 * (8) return the name of the false index file (still locked);
295 *
296 * The caller should run hooks on the locked false index, and
297 * create commit from it. Then
298 * (A) if all goes well, commit the real index;
299 * (B) on failure, rollback the real index;
300 * In either case, rollback the false index.
301 */
302 commit_style = COMMIT_PARTIAL;
303
304 if (file_exists(git_path("MERGE_HEAD")))
305 die("cannot do a partial commit during a merge.");
306
307 memset(&partial, 0, sizeof(partial));
308 partial.strdup_strings = 1;
309 if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
310 exit(1);
311
312 discard_cache();
313 if (read_cache() < 0)
314 die("cannot read the index");
315
316 fd = hold_locked_index(&index_lock, 1);
317 add_remove_files(&partial);
318 refresh_cache(REFRESH_QUIET);
319 if (write_cache(fd, active_cache, active_nr) ||
320 close_lock_file(&index_lock))
321 die("unable to write new_index file");
322
323 fd = hold_lock_file_for_update(&false_lock,
324 git_path("next-index-%"PRIuMAX,
325 (uintmax_t) getpid()),
326 LOCK_DIE_ON_ERROR);
327
328 create_base_index();
329 add_remove_files(&partial);
330 refresh_cache(REFRESH_QUIET);
331
332 if (write_cache(fd, active_cache, active_nr) ||
333 close_lock_file(&false_lock))
334 die("unable to write temporary index file");
335
336 discard_cache();
337 read_cache_from(false_lock.filename);
338
339 return false_lock.filename;
340 }
341
342 static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn)
343 {
344 struct wt_status s;
345
346 wt_status_prepare(&s);
347 if (wt_status_relative_paths)
348 s.prefix = prefix;
349
350 if (amend) {
351 s.amend = 1;
352 s.reference = "HEAD^1";
353 }
354 s.verbose = verbose;
355 s.untracked = (show_untracked_files == SHOW_ALL_UNTRACKED_FILES);
356 s.index_file = index_file;
357 s.fp = fp;
358 s.nowarn = nowarn;
359
360 wt_status_print(&s);
361
362 return s.commitable;
363 }
364
365 static int run_hook(const char *index_file, const char *name, ...)
366 {
367 struct child_process hook;
368 const char *argv[10], *env[2];
369 char index[PATH_MAX];
370 va_list args;
371 int i;
372
373 va_start(args, name);
374 argv[0] = git_path("hooks/%s", name);
375 i = 0;
376 do {
377 if (++i >= ARRAY_SIZE(argv))
378 die ("run_hook(): too many arguments");
379 argv[i] = va_arg(args, const char *);
380 } while (argv[i]);
381 va_end(args);
382
383 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
384 env[0] = index;
385 env[1] = NULL;
386
387 if (access(argv[0], X_OK) < 0)
388 return 0;
389
390 memset(&hook, 0, sizeof(hook));
391 hook.argv = argv;
392 hook.no_stdin = 1;
393 hook.stdout_to_stderr = 1;
394 hook.env = env;
395
396 return run_command(&hook);
397 }
398
399 static int is_a_merge(const unsigned char *sha1)
400 {
401 struct commit *commit = lookup_commit(sha1);
402 if (!commit || parse_commit(commit))
403 die("could not parse HEAD commit");
404 return !!(commit->parents && commit->parents->next);
405 }
406
407 static const char sign_off_header[] = "Signed-off-by: ";
408
409 static void determine_author_info(void)
410 {
411 char *name, *email, *date;
412
413 name = getenv("GIT_AUTHOR_NAME");
414 email = getenv("GIT_AUTHOR_EMAIL");
415 date = getenv("GIT_AUTHOR_DATE");
416
417 if (use_message) {
418 const char *a, *lb, *rb, *eol;
419
420 a = strstr(use_message_buffer, "\nauthor ");
421 if (!a)
422 die("invalid commit: %s", use_message);
423
424 lb = strstr(a + 8, " <");
425 rb = strstr(a + 8, "> ");
426 eol = strchr(a + 8, '\n');
427 if (!lb || !rb || !eol)
428 die("invalid commit: %s", use_message);
429
430 name = xstrndup(a + 8, lb - (a + 8));
431 email = xstrndup(lb + 2, rb - (lb + 2));
432 date = xstrndup(rb + 2, eol - (rb + 2));
433 }
434
435 if (force_author) {
436 const char *lb = strstr(force_author, " <");
437 const char *rb = strchr(force_author, '>');
438
439 if (!lb || !rb)
440 die("malformed --author parameter");
441 name = xstrndup(force_author, lb - force_author);
442 email = xstrndup(lb + 2, rb - (lb + 2));
443 }
444
445 author_name = name;
446 author_email = email;
447 author_date = date;
448 }
449
450 static int prepare_to_commit(const char *index_file, const char *prefix)
451 {
452 struct stat statbuf;
453 int commitable, saved_color_setting;
454 struct strbuf sb = STRBUF_INIT;
455 char *buffer;
456 FILE *fp;
457 const char *hook_arg1 = NULL;
458 const char *hook_arg2 = NULL;
459 int ident_shown = 0;
460
461 if (!no_verify && run_hook(index_file, "pre-commit", NULL))
462 return 0;
463
464 if (message.len) {
465 strbuf_addbuf(&sb, &message);
466 hook_arg1 = "message";
467 } else if (logfile && !strcmp(logfile, "-")) {
468 if (isatty(0))
469 fprintf(stderr, "(reading log message from standard input)\n");
470 if (strbuf_read(&sb, 0, 0) < 0)
471 die("could not read log from standard input");
472 hook_arg1 = "message";
473 } else if (logfile) {
474 if (strbuf_read_file(&sb, logfile, 0) < 0)
475 die("could not read log file '%s': %s",
476 logfile, strerror(errno));
477 hook_arg1 = "message";
478 } else if (use_message) {
479 buffer = strstr(use_message_buffer, "\n\n");
480 if (!buffer || buffer[2] == '\0')
481 die("commit has empty message");
482 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
483 hook_arg1 = "commit";
484 hook_arg2 = use_message;
485 } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
486 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
487 die("could not read MERGE_MSG: %s", strerror(errno));
488 hook_arg1 = "merge";
489 } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
490 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
491 die("could not read SQUASH_MSG: %s", strerror(errno));
492 hook_arg1 = "squash";
493 } else if (template_file && !stat(template_file, &statbuf)) {
494 if (strbuf_read_file(&sb, template_file, 0) < 0)
495 die("could not read %s: %s",
496 template_file, strerror(errno));
497 hook_arg1 = "template";
498 }
499
500 /*
501 * This final case does not modify the template message,
502 * it just sets the argument to the prepare-commit-msg hook.
503 */
504 else if (in_merge)
505 hook_arg1 = "merge";
506
507 fp = fopen(git_path(commit_editmsg), "w");
508 if (fp == NULL)
509 die("could not open %s: %s",
510 git_path(commit_editmsg), strerror(errno));
511
512 if (cleanup_mode != CLEANUP_NONE)
513 stripspace(&sb, 0);
514
515 if (signoff) {
516 struct strbuf sob = STRBUF_INIT;
517 int i;
518
519 strbuf_addstr(&sob, sign_off_header);
520 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
521 getenv("GIT_COMMITTER_EMAIL")));
522 strbuf_addch(&sob, '\n');
523 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
524 ; /* do nothing */
525 if (prefixcmp(sb.buf + i, sob.buf)) {
526 if (prefixcmp(sb.buf + i, sign_off_header))
527 strbuf_addch(&sb, '\n');
528 strbuf_addbuf(&sb, &sob);
529 }
530 strbuf_release(&sob);
531 }
532
533 if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
534 die("could not write commit template: %s", strerror(errno));
535
536 strbuf_release(&sb);
537
538 determine_author_info();
539
540 /* This checks if committer ident is explicitly given */
541 git_committer_info(0);
542 if (use_editor) {
543 char *author_ident;
544 const char *committer_ident;
545
546 if (in_merge)
547 fprintf(fp,
548 "#\n"
549 "# It looks like you may be committing a MERGE.\n"
550 "# If this is not correct, please remove the file\n"
551 "# %s\n"
552 "# and try again.\n"
553 "#\n",
554 git_path("MERGE_HEAD"));
555
556 fprintf(fp,
557 "\n"
558 "# Please enter the commit message for your changes.");
559 if (cleanup_mode == CLEANUP_ALL)
560 fprintf(fp,
561 " Lines starting\n"
562 "# with '#' will be ignored, and an empty"
563 " message aborts the commit.\n");
564 else /* CLEANUP_SPACE, that is. */
565 fprintf(fp,
566 " Lines starting\n"
567 "# with '#' will be kept; you may remove them"
568 " yourself if you want to.\n"
569 "# An empty message aborts the commit.\n");
570 if (only_include_assumed)
571 fprintf(fp, "# %s\n", only_include_assumed);
572
573 author_ident = xstrdup(fmt_name(author_name, author_email));
574 committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
575 getenv("GIT_COMMITTER_EMAIL"));
576 if (strcmp(author_ident, committer_ident))
577 fprintf(fp,
578 "%s"
579 "# Author: %s\n",
580 ident_shown++ ? "" : "#\n",
581 author_ident);
582 free(author_ident);
583
584 if (!user_ident_explicitly_given)
585 fprintf(fp,
586 "%s"
587 "# Committer: %s\n",
588 ident_shown++ ? "" : "#\n",
589 committer_ident);
590
591 if (ident_shown)
592 fprintf(fp, "#\n");
593
594 saved_color_setting = wt_status_use_color;
595 wt_status_use_color = 0;
596 commitable = run_status(fp, index_file, prefix, 1);
597 wt_status_use_color = saved_color_setting;
598 } else {
599 struct rev_info rev;
600 unsigned char sha1[20];
601 const char *parent = "HEAD";
602
603 if (!active_nr && read_cache() < 0)
604 die("Cannot read index");
605
606 if (amend)
607 parent = "HEAD^1";
608
609 if (get_sha1(parent, sha1))
610 commitable = !!active_nr;
611 else {
612 init_revisions(&rev, "");
613 rev.abbrev = 0;
614 setup_revisions(0, NULL, &rev, parent);
615 DIFF_OPT_SET(&rev.diffopt, QUIET);
616 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
617 run_diff_index(&rev, 1 /* cached */);
618
619 commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
620 }
621 }
622
623 fclose(fp);
624
625 if (!commitable && !in_merge && !allow_empty &&
626 !(amend && is_a_merge(head_sha1))) {
627 run_status(stdout, index_file, prefix, 0);
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 */
673 static 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
712 static 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
737 static 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
859 int 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 if (diff_use_color_default == -1)
870 diff_use_color_default = git_use_color_default;
871
872 argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
873
874 index_file = prepare_index(argc, argv, prefix);
875
876 commitable = run_status(stdout, index_file, prefix, 0);
877
878 rollback_index_files();
879
880 return commitable ? 0 : 1;
881 }
882
883 static void print_summary(const char *prefix, const unsigned char *sha1)
884 {
885 struct rev_info rev;
886 struct commit *commit;
887 static const char *format = "format:%h: \"%s\"";
888 unsigned char junk_sha1[20];
889 const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
890
891 commit = lookup_commit(sha1);
892 if (!commit)
893 die("couldn't look up newly created commit");
894 if (!commit || parse_commit(commit))
895 die("could not parse newly created commit");
896
897 init_revisions(&rev, prefix);
898 setup_revisions(0, NULL, &rev, NULL);
899
900 rev.abbrev = 0;
901 rev.diff = 1;
902 rev.diffopt.output_format =
903 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
904
905 rev.verbose_header = 1;
906 rev.show_root_diff = 1;
907 get_commit_format(format, &rev);
908 rev.always_show_header = 0;
909 rev.diffopt.detect_rename = 1;
910 rev.diffopt.rename_limit = 100;
911 rev.diffopt.break_opt = 0;
912 diff_setup_done(&rev.diffopt);
913
914 printf("[%s%s]: created ",
915 !prefixcmp(head, "refs/heads/") ?
916 head + 11 :
917 !strcmp(head, "HEAD") ?
918 "detached HEAD" :
919 head,
920 initial_commit ? " (root-commit)" : "");
921
922 if (!log_tree_commit(&rev, commit)) {
923 struct strbuf buf = STRBUF_INIT;
924 format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
925 printf("%s\n", buf.buf);
926 strbuf_release(&buf);
927 }
928 }
929
930 static int git_commit_config(const char *k, const char *v, void *cb)
931 {
932 if (!strcmp(k, "commit.template"))
933 return git_config_string(&template_file, k, v);
934
935 return git_status_config(k, v, cb);
936 }
937
938 int cmd_commit(int argc, const char **argv, const char *prefix)
939 {
940 struct strbuf sb = STRBUF_INIT;
941 const char *index_file, *reflog_msg;
942 char *nl, *p;
943 unsigned char commit_sha1[20];
944 struct ref_lock *ref_lock;
945 struct commit_list *parents = NULL, **pptr = &parents;
946 struct stat statbuf;
947 int allow_fast_forward = 1;
948
949 git_config(git_commit_config, NULL);
950
951 if (wt_status_use_color == -1)
952 wt_status_use_color = git_use_color_default;
953
954 argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
955
956 index_file = prepare_index(argc, argv, prefix);
957
958 /* Set up everything for writing the commit object. This includes
959 running hooks, writing the trees, and interacting with the user. */
960 if (!prepare_to_commit(index_file, prefix)) {
961 rollback_index_files();
962 return 1;
963 }
964
965 /* Determine parents */
966 if (initial_commit) {
967 reflog_msg = "commit (initial)";
968 } else if (amend) {
969 struct commit_list *c;
970 struct commit *commit;
971
972 reflog_msg = "commit (amend)";
973 commit = lookup_commit(head_sha1);
974 if (!commit || parse_commit(commit))
975 die("could not parse HEAD commit");
976
977 for (c = commit->parents; c; c = c->next)
978 pptr = &commit_list_insert(c->item, pptr)->next;
979 } else if (in_merge) {
980 struct strbuf m = STRBUF_INIT;
981 FILE *fp;
982
983 reflog_msg = "commit (merge)";
984 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
985 fp = fopen(git_path("MERGE_HEAD"), "r");
986 if (fp == NULL)
987 die("could not open %s for reading: %s",
988 git_path("MERGE_HEAD"), strerror(errno));
989 while (strbuf_getline(&m, fp, '\n') != EOF) {
990 unsigned char sha1[20];
991 if (get_sha1_hex(m.buf, sha1) < 0)
992 die("Corrupt MERGE_HEAD file (%s)", m.buf);
993 pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
994 }
995 fclose(fp);
996 strbuf_release(&m);
997 if (!stat(git_path("MERGE_MODE"), &statbuf)) {
998 if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
999 die("could not read MERGE_MODE: %s",
1000 strerror(errno));
1001 if (!strcmp(sb.buf, "no-ff"))
1002 allow_fast_forward = 0;
1003 }
1004 if (allow_fast_forward)
1005 parents = reduce_heads(parents);
1006 } else {
1007 reflog_msg = "commit";
1008 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
1009 }
1010
1011 /* Finally, get the commit message */
1012 strbuf_reset(&sb);
1013 if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
1014 rollback_index_files();
1015 die("could not read commit message");
1016 }
1017
1018 /* Truncate the message just before the diff, if any. */
1019 if (verbose) {
1020 p = strstr(sb.buf, "\ndiff --git ");
1021 if (p != NULL)
1022 strbuf_setlen(&sb, p - sb.buf + 1);
1023 }
1024
1025 if (cleanup_mode != CLEANUP_NONE)
1026 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
1027 if (message_is_empty(&sb)) {
1028 rollback_index_files();
1029 fprintf(stderr, "Aborting commit due to empty commit message.\n");
1030 exit(1);
1031 }
1032
1033 if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
1034 fmt_ident(author_name, author_email, author_date,
1035 IDENT_ERROR_ON_NO_NAME))) {
1036 rollback_index_files();
1037 die("failed to write commit object");
1038 }
1039
1040 ref_lock = lock_any_ref_for_update("HEAD",
1041 initial_commit ? NULL : head_sha1,
1042 0);
1043
1044 nl = strchr(sb.buf, '\n');
1045 if (nl)
1046 strbuf_setlen(&sb, nl + 1 - sb.buf);
1047 else
1048 strbuf_addch(&sb, '\n');
1049 strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1050 strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1051
1052 if (!ref_lock) {
1053 rollback_index_files();
1054 die("cannot lock HEAD ref");
1055 }
1056 if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1057 rollback_index_files();
1058 die("cannot update HEAD ref");
1059 }
1060
1061 unlink(git_path("MERGE_HEAD"));
1062 unlink(git_path("MERGE_MSG"));
1063 unlink(git_path("MERGE_MODE"));
1064 unlink(git_path("SQUASH_MSG"));
1065
1066 if (commit_index_files())
1067 die ("Repository has been updated, but unable to write\n"
1068 "new_index file. Check that disk is not full or quota is\n"
1069 "not exceeded, and then \"git reset HEAD\" to recover.");
1070
1071 rerere();
1072 run_hook(get_index_file(), "post-commit", NULL);
1073 if (!quiet)
1074 print_summary(prefix, commit_sha1);
1075
1076 return 0;
1077 }