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