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