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