Merge branch 'jf/am-failure-report'
[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                 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
341 static 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
364 static int is_a_merge(const unsigned char *sha1)
365 {
366         struct commit *commit = lookup_commit(sha1);
367         if (!commit || parse_commit(commit))
368                 die("could not parse HEAD commit");
369         return !!(commit->parents && commit->parents->next);
370 }
371
372 static const char sign_off_header[] = "Signed-off-by: ";
373
374 static void determine_author_info(void)
375 {
376         char *name, *email, *date;
377
378         name = getenv("GIT_AUTHOR_NAME");
379         email = getenv("GIT_AUTHOR_EMAIL");
380         date = getenv("GIT_AUTHOR_DATE");
381
382         if (use_message) {
383                 const char *a, *lb, *rb, *eol;
384
385                 a = strstr(use_message_buffer, "\nauthor ");
386                 if (!a)
387                         die("invalid commit: %s", use_message);
388
389                 lb = strstr(a + 8, " <");
390                 rb = strstr(a + 8, "> ");
391                 eol = strchr(a + 8, '\n');
392                 if (!lb || !rb || !eol)
393                         die("invalid commit: %s", use_message);
394
395                 name = xstrndup(a + 8, lb - (a + 8));
396                 email = xstrndup(lb + 2, rb - (lb + 2));
397                 date = xstrndup(rb + 2, eol - (rb + 2));
398         }
399
400         if (force_author) {
401                 const char *lb = strstr(force_author, " <");
402                 const char *rb = strchr(force_author, '>');
403
404                 if (!lb || !rb)
405                         die("malformed --author parameter");
406                 name = xstrndup(force_author, lb - force_author);
407                 email = xstrndup(lb + 2, rb - (lb + 2));
408         }
409
410         author_name = name;
411         author_email = email;
412         author_date = date;
413 }
414
415 static int prepare_to_commit(const char *index_file, const char *prefix)
416 {
417         struct stat statbuf;
418         int commitable, saved_color_setting;
419         struct strbuf sb = STRBUF_INIT;
420         char *buffer;
421         FILE *fp;
422         const char *hook_arg1 = NULL;
423         const char *hook_arg2 = NULL;
424         int ident_shown = 0;
425
426         if (!no_verify && run_hook(index_file, "pre-commit", NULL))
427                 return 0;
428
429         if (message.len) {
430                 strbuf_addbuf(&sb, &message);
431                 hook_arg1 = "message";
432         } else if (logfile && !strcmp(logfile, "-")) {
433                 if (isatty(0))
434                         fprintf(stderr, "(reading log message from standard input)\n");
435                 if (strbuf_read(&sb, 0, 0) < 0)
436                         die("could not read log from standard input");
437                 hook_arg1 = "message";
438         } else if (logfile) {
439                 if (strbuf_read_file(&sb, logfile, 0) < 0)
440                         die("could not read log file '%s': %s",
441                             logfile, strerror(errno));
442                 hook_arg1 = "message";
443         } else if (use_message) {
444                 buffer = strstr(use_message_buffer, "\n\n");
445                 if (!buffer || buffer[2] == '\0')
446                         die("commit has empty message");
447                 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
448                 hook_arg1 = "commit";
449                 hook_arg2 = use_message;
450         } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
451                 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
452                         die("could not read MERGE_MSG: %s", strerror(errno));
453                 hook_arg1 = "merge";
454         } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
455                 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
456                         die("could not read SQUASH_MSG: %s", strerror(errno));
457                 hook_arg1 = "squash";
458         } else if (template_file && !stat(template_file, &statbuf)) {
459                 if (strbuf_read_file(&sb, template_file, 0) < 0)
460                         die("could not read %s: %s",
461                             template_file, strerror(errno));
462                 hook_arg1 = "template";
463         }
464
465         /*
466          * This final case does not modify the template message,
467          * it just sets the argument to the prepare-commit-msg hook.
468          */
469         else if (in_merge)
470                 hook_arg1 = "merge";
471
472         fp = fopen(git_path(commit_editmsg), "w");
473         if (fp == NULL)
474                 die("could not open %s: %s",
475                     git_path(commit_editmsg), strerror(errno));
476
477         if (cleanup_mode != CLEANUP_NONE)
478                 stripspace(&sb, 0);
479
480         if (signoff) {
481                 struct strbuf sob = STRBUF_INIT;
482                 int i;
483
484                 strbuf_addstr(&sob, sign_off_header);
485                 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
486                                              getenv("GIT_COMMITTER_EMAIL")));
487                 strbuf_addch(&sob, '\n');
488                 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
489                         ; /* do nothing */
490                 if (prefixcmp(sb.buf + i, sob.buf)) {
491                         if (prefixcmp(sb.buf + i, sign_off_header))
492                                 strbuf_addch(&sb, '\n');
493                         strbuf_addbuf(&sb, &sob);
494                 }
495                 strbuf_release(&sob);
496         }
497
498         if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
499                 die("could not write commit template: %s", strerror(errno));
500
501         strbuf_release(&sb);
502
503         determine_author_info();
504
505         /* This checks if committer ident is explicitly given */
506         git_committer_info(0);
507         if (use_editor) {
508                 char *author_ident;
509                 const char *committer_ident;
510
511                 if (in_merge)
512                         fprintf(fp,
513                                 "#\n"
514                                 "# It looks like you may be committing a MERGE.\n"
515                                 "# If this is not correct, please remove the file\n"
516                                 "#      %s\n"
517                                 "# and try again.\n"
518                                 "#\n",
519                                 git_path("MERGE_HEAD"));
520
521                 fprintf(fp,
522                         "\n"
523                         "# Please enter the commit message for your changes.");
524                 if (cleanup_mode == CLEANUP_ALL)
525                         fprintf(fp,
526                                 " Lines starting\n"
527                                 "# with '#' will be ignored, and an empty"
528                                 " message aborts the commit.\n");
529                 else /* CLEANUP_SPACE, that is. */
530                         fprintf(fp,
531                                 " Lines starting\n"
532                                 "# with '#' will be kept; you may remove them"
533                                 " yourself if you want to.\n"
534                                 "# An empty message aborts the commit.\n");
535                 if (only_include_assumed)
536                         fprintf(fp, "# %s\n", only_include_assumed);
537
538                 author_ident = xstrdup(fmt_name(author_name, author_email));
539                 committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
540                                            getenv("GIT_COMMITTER_EMAIL"));
541                 if (strcmp(author_ident, committer_ident))
542                         fprintf(fp,
543                                 "%s"
544                                 "# Author:    %s\n",
545                                 ident_shown++ ? "" : "#\n",
546                                 author_ident);
547                 free(author_ident);
548
549                 if (!user_ident_explicitly_given)
550                         fprintf(fp,
551                                 "%s"
552                                 "# Committer: %s\n",
553                                 ident_shown++ ? "" : "#\n",
554                                 committer_ident);
555
556                 if (ident_shown)
557                         fprintf(fp, "#\n");
558
559                 saved_color_setting = wt_status_use_color;
560                 wt_status_use_color = 0;
561                 commitable = run_status(fp, index_file, prefix, 1);
562                 wt_status_use_color = saved_color_setting;
563         } else {
564                 struct rev_info rev;
565                 unsigned char sha1[20];
566                 const char *parent = "HEAD";
567
568                 if (!active_nr && read_cache() < 0)
569                         die("Cannot read index");
570
571                 if (amend)
572                         parent = "HEAD^1";
573
574                 if (get_sha1(parent, sha1))
575                         commitable = !!active_nr;
576                 else {
577                         init_revisions(&rev, "");
578                         rev.abbrev = 0;
579                         setup_revisions(0, NULL, &rev, parent);
580                         DIFF_OPT_SET(&rev.diffopt, QUIET);
581                         DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
582                         run_diff_index(&rev, 1 /* cached */);
583
584                         commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
585                 }
586         }
587
588         fclose(fp);
589
590         if (!commitable && !in_merge && !allow_empty &&
591             !(amend && is_a_merge(head_sha1))) {
592                 run_status(stdout, index_file, prefix, 0);
593                 return 0;
594         }
595
596         /*
597          * Re-read the index as pre-commit hook could have updated it,
598          * and write it out as a tree.  We must do this before we invoke
599          * the editor and after we invoke run_status above.
600          */
601         discard_cache();
602         read_cache_from(index_file);
603         if (!active_cache_tree)
604                 active_cache_tree = cache_tree();
605         if (cache_tree_update(active_cache_tree,
606                               active_cache, active_nr, 0, 0) < 0) {
607                 error("Error building trees");
608                 return 0;
609         }
610
611         if (run_hook(index_file, "prepare-commit-msg",
612                      git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
613                 return 0;
614
615         if (use_editor) {
616                 char index[PATH_MAX];
617                 const char *env[2] = { index, NULL };
618                 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
619                 if (launch_editor(git_path(commit_editmsg), NULL, env)) {
620                         fprintf(stderr,
621                         "Please supply the message using either -m or -F option.\n");
622                         exit(1);
623                 }
624         }
625
626         if (!no_verify &&
627             run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
628                 return 0;
629         }
630
631         return 1;
632 }
633
634 /*
635  * Find out if the message in the strbuf contains only whitespace and
636  * Signed-off-by lines.
637  */
638 static int message_is_empty(struct strbuf *sb)
639 {
640         struct strbuf tmpl = STRBUF_INIT;
641         const char *nl;
642         int eol, i, start = 0;
643
644         if (cleanup_mode == CLEANUP_NONE && sb->len)
645                 return 0;
646
647         /* See if the template is just a prefix of the message. */
648         if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
649                 stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
650                 if (start + tmpl.len <= sb->len &&
651                     memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
652                         start += tmpl.len;
653         }
654         strbuf_release(&tmpl);
655
656         /* Check if the rest is just whitespace and Signed-of-by's. */
657         for (i = start; i < sb->len; i++) {
658                 nl = memchr(sb->buf + i, '\n', sb->len - i);
659                 if (nl)
660                         eol = nl - sb->buf;
661                 else
662                         eol = sb->len;
663
664                 if (strlen(sign_off_header) <= eol - i &&
665                     !prefixcmp(sb->buf + i, sign_off_header)) {
666                         i = eol;
667                         continue;
668                 }
669                 while (i < eol)
670                         if (!isspace(sb->buf[i++]))
671                                 return 0;
672         }
673
674         return 1;
675 }
676
677 static const char *find_author_by_nickname(const char *name)
678 {
679         struct rev_info revs;
680         struct commit *commit;
681         struct strbuf buf = STRBUF_INIT;
682         const char *av[20];
683         int ac = 0;
684
685         init_revisions(&revs, NULL);
686         strbuf_addf(&buf, "--author=%s", name);
687         av[++ac] = "--all";
688         av[++ac] = "-i";
689         av[++ac] = buf.buf;
690         av[++ac] = NULL;
691         setup_revisions(ac, av, &revs, NULL);
692         prepare_revision_walk(&revs);
693         commit = get_revision(&revs);
694         if (commit) {
695                 strbuf_release(&buf);
696                 format_commit_message(commit, "%an <%ae>", &buf, DATE_NORMAL);
697                 return strbuf_detach(&buf, NULL);
698         }
699         die("No existing author found with '%s'", name);
700 }
701
702 static int parse_and_validate_options(int argc, const char *argv[],
703                                       const char * const usage[],
704                                       const char *prefix)
705 {
706         int f = 0;
707
708         argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
709         logfile = parse_options_fix_filename(prefix, logfile);
710         template_file = parse_options_fix_filename(prefix, template_file);
711
712         if (force_author && !strchr(force_author, '>'))
713                 force_author = find_author_by_nickname(force_author);
714
715         if (logfile || message.len || use_message)
716                 use_editor = 0;
717         if (edit_flag)
718                 use_editor = 1;
719         if (!use_editor)
720                 setenv("GIT_EDITOR", ":", 1);
721
722         if (get_sha1("HEAD", head_sha1))
723                 initial_commit = 1;
724
725         if (!get_sha1("MERGE_HEAD", merge_head_sha1))
726                 in_merge = 1;
727
728         /* Sanity check options */
729         if (amend && initial_commit)
730                 die("You have nothing to amend.");
731         if (amend && in_merge)
732                 die("You are in the middle of a merge -- cannot amend.");
733
734         if (use_message)
735                 f++;
736         if (edit_message)
737                 f++;
738         if (logfile)
739                 f++;
740         if (f > 1)
741                 die("Only one of -c/-C/-F can be used.");
742         if (message.len && f > 0)
743                 die("Option -m cannot be combined with -c/-C/-F.");
744         if (edit_message)
745                 use_message = edit_message;
746         if (amend && !use_message)
747                 use_message = "HEAD";
748         if (use_message) {
749                 unsigned char sha1[20];
750                 static char utf8[] = "UTF-8";
751                 const char *out_enc;
752                 char *enc, *end;
753                 struct commit *commit;
754
755                 if (get_sha1(use_message, sha1))
756                         die("could not lookup commit %s", use_message);
757                 commit = lookup_commit_reference(sha1);
758                 if (!commit || parse_commit(commit))
759                         die("could not parse commit %s", use_message);
760
761                 enc = strstr(commit->buffer, "\nencoding");
762                 if (enc) {
763                         end = strchr(enc + 10, '\n');
764                         enc = xstrndup(enc + 10, end - (enc + 10));
765                 } else {
766                         enc = utf8;
767                 }
768                 out_enc = git_commit_encoding ? git_commit_encoding : utf8;
769
770                 if (strcmp(out_enc, enc))
771                         use_message_buffer =
772                                 reencode_string(commit->buffer, out_enc, enc);
773
774                 /*
775                  * If we failed to reencode the buffer, just copy it
776                  * byte for byte so the user can try to fix it up.
777                  * This also handles the case where input and output
778                  * encodings are identical.
779                  */
780                 if (use_message_buffer == NULL)
781                         use_message_buffer = xstrdup(commit->buffer);
782                 if (enc != utf8)
783                         free(enc);
784         }
785
786         if (!!also + !!only + !!all + !!interactive > 1)
787                 die("Only one of --include/--only/--all/--interactive can be used.");
788         if (argc == 0 && (also || (only && !amend)))
789                 die("No paths with --include/--only does not make sense.");
790         if (argc == 0 && only && amend)
791                 only_include_assumed = "Clever... amending the last one with dirty index.";
792         if (argc > 0 && !also && !only)
793                 only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
794         if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
795                 cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
796         else if (!strcmp(cleanup_arg, "verbatim"))
797                 cleanup_mode = CLEANUP_NONE;
798         else if (!strcmp(cleanup_arg, "whitespace"))
799                 cleanup_mode = CLEANUP_SPACE;
800         else if (!strcmp(cleanup_arg, "strip"))
801                 cleanup_mode = CLEANUP_ALL;
802         else
803                 die("Invalid cleanup mode %s", cleanup_arg);
804
805         if (!untracked_files_arg)
806                 ; /* default already initialized */
807         else if (!strcmp(untracked_files_arg, "no"))
808                 show_untracked_files = SHOW_NO_UNTRACKED_FILES;
809         else if (!strcmp(untracked_files_arg, "normal"))
810                 show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
811         else if (!strcmp(untracked_files_arg, "all"))
812                 show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
813         else
814                 die("Invalid untracked files mode '%s'", untracked_files_arg);
815
816         if (all && argc > 0)
817                 die("Paths with -a does not make sense.");
818         else if (interactive && argc > 0)
819                 die("Paths with --interactive does not make sense.");
820
821         return argc;
822 }
823
824 int cmd_status(int argc, const char **argv, const char *prefix)
825 {
826         const char *index_file;
827         int commitable;
828
829         git_config(git_status_config, NULL);
830
831         if (wt_status_use_color == -1)
832                 wt_status_use_color = git_use_color_default;
833
834         if (diff_use_color_default == -1)
835                 diff_use_color_default = git_use_color_default;
836
837         argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
838
839         index_file = prepare_index(argc, argv, prefix);
840
841         commitable = run_status(stdout, index_file, prefix, 0);
842
843         rollback_index_files();
844
845         return commitable ? 0 : 1;
846 }
847
848 static void print_summary(const char *prefix, const unsigned char *sha1)
849 {
850         struct rev_info rev;
851         struct commit *commit;
852         static const char *format = "format:%h] %s";
853         unsigned char junk_sha1[20];
854         const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
855
856         commit = lookup_commit(sha1);
857         if (!commit)
858                 die("couldn't look up newly created commit");
859         if (!commit || parse_commit(commit))
860                 die("could not parse newly created commit");
861
862         init_revisions(&rev, prefix);
863         setup_revisions(0, NULL, &rev, NULL);
864
865         rev.abbrev = 0;
866         rev.diff = 1;
867         rev.diffopt.output_format =
868                 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
869
870         rev.verbose_header = 1;
871         rev.show_root_diff = 1;
872         get_commit_format(format, &rev);
873         rev.always_show_header = 0;
874         rev.diffopt.detect_rename = 1;
875         rev.diffopt.rename_limit = 100;
876         rev.diffopt.break_opt = 0;
877         diff_setup_done(&rev.diffopt);
878
879         printf("[%s%s ",
880                 !prefixcmp(head, "refs/heads/") ?
881                         head + 11 :
882                         !strcmp(head, "HEAD") ?
883                                 "detached HEAD" :
884                                 head,
885                 initial_commit ? " (root-commit)" : "");
886
887         if (!log_tree_commit(&rev, commit)) {
888                 struct strbuf buf = STRBUF_INIT;
889                 format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
890                 printf("%s\n", buf.buf);
891                 strbuf_release(&buf);
892         }
893 }
894
895 static int git_commit_config(const char *k, const char *v, void *cb)
896 {
897         if (!strcmp(k, "commit.template"))
898                 return git_config_string(&template_file, k, v);
899
900         return git_status_config(k, v, cb);
901 }
902
903 int cmd_commit(int argc, const char **argv, const char *prefix)
904 {
905         struct strbuf sb = STRBUF_INIT;
906         const char *index_file, *reflog_msg;
907         char *nl, *p;
908         unsigned char commit_sha1[20];
909         struct ref_lock *ref_lock;
910         struct commit_list *parents = NULL, **pptr = &parents;
911         struct stat statbuf;
912         int allow_fast_forward = 1;
913
914         git_config(git_commit_config, NULL);
915
916         if (wt_status_use_color == -1)
917                 wt_status_use_color = git_use_color_default;
918
919         argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
920
921         index_file = prepare_index(argc, argv, prefix);
922
923         /* Set up everything for writing the commit object.  This includes
924            running hooks, writing the trees, and interacting with the user.  */
925         if (!prepare_to_commit(index_file, prefix)) {
926                 rollback_index_files();
927                 return 1;
928         }
929
930         /* Determine parents */
931         if (initial_commit) {
932                 reflog_msg = "commit (initial)";
933         } else if (amend) {
934                 struct commit_list *c;
935                 struct commit *commit;
936
937                 reflog_msg = "commit (amend)";
938                 commit = lookup_commit(head_sha1);
939                 if (!commit || parse_commit(commit))
940                         die("could not parse HEAD commit");
941
942                 for (c = commit->parents; c; c = c->next)
943                         pptr = &commit_list_insert(c->item, pptr)->next;
944         } else if (in_merge) {
945                 struct strbuf m = STRBUF_INIT;
946                 FILE *fp;
947
948                 reflog_msg = "commit (merge)";
949                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
950                 fp = fopen(git_path("MERGE_HEAD"), "r");
951                 if (fp == NULL)
952                         die("could not open %s for reading: %s",
953                             git_path("MERGE_HEAD"), strerror(errno));
954                 while (strbuf_getline(&m, fp, '\n') != EOF) {
955                         unsigned char sha1[20];
956                         if (get_sha1_hex(m.buf, sha1) < 0)
957                                 die("Corrupt MERGE_HEAD file (%s)", m.buf);
958                         pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
959                 }
960                 fclose(fp);
961                 strbuf_release(&m);
962                 if (!stat(git_path("MERGE_MODE"), &statbuf)) {
963                         if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
964                                 die("could not read MERGE_MODE: %s",
965                                                 strerror(errno));
966                         if (!strcmp(sb.buf, "no-ff"))
967                                 allow_fast_forward = 0;
968                 }
969                 if (allow_fast_forward)
970                         parents = reduce_heads(parents);
971         } else {
972                 reflog_msg = "commit";
973                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
974         }
975
976         /* Finally, get the commit message */
977         strbuf_reset(&sb);
978         if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
979                 rollback_index_files();
980                 die("could not read commit message");
981         }
982
983         /* Truncate the message just before the diff, if any. */
984         if (verbose) {
985                 p = strstr(sb.buf, "\ndiff --git ");
986                 if (p != NULL)
987                         strbuf_setlen(&sb, p - sb.buf + 1);
988         }
989
990         if (cleanup_mode != CLEANUP_NONE)
991                 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
992         if (message_is_empty(&sb)) {
993                 rollback_index_files();
994                 fprintf(stderr, "Aborting commit due to empty commit message.\n");
995                 exit(1);
996         }
997
998         if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
999                         fmt_ident(author_name, author_email, author_date,
1000                                 IDENT_ERROR_ON_NO_NAME))) {
1001                 rollback_index_files();
1002                 die("failed to write commit object");
1003         }
1004
1005         ref_lock = lock_any_ref_for_update("HEAD",
1006                                            initial_commit ? NULL : head_sha1,
1007                                            0);
1008
1009         nl = strchr(sb.buf, '\n');
1010         if (nl)
1011                 strbuf_setlen(&sb, nl + 1 - sb.buf);
1012         else
1013                 strbuf_addch(&sb, '\n');
1014         strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1015         strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1016
1017         if (!ref_lock) {
1018                 rollback_index_files();
1019                 die("cannot lock HEAD ref");
1020         }
1021         if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1022                 rollback_index_files();
1023                 die("cannot update HEAD ref");
1024         }
1025
1026         unlink(git_path("MERGE_HEAD"));
1027         unlink(git_path("MERGE_MSG"));
1028         unlink(git_path("MERGE_MODE"));
1029         unlink(git_path("SQUASH_MSG"));
1030
1031         if (commit_index_files())
1032                 die ("Repository has been updated, but unable to write\n"
1033                      "new_index file. Check that disk is not full or quota is\n"
1034                      "not exceeded, and then \"git reset HEAD\" to recover.");
1035
1036         rerere();
1037         run_hook(get_index_file(), "post-commit", NULL);
1038         if (!quiet)
1039                 print_summary(prefix, commit_sha1);
1040
1041         return 0;
1042 }