builtin-commit.c 30.5 KB
Newer Older
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1 2 3 4 5 6 7 8 9
/*
 * Builtin "git commit"
 *
 * Copyright (c) 2007 Kristian Høgsberg <[email protected]>
 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
 */

#include "cache.h"
#include "cache-tree.h"
10
#include "color.h"
11
#include "dir.h"
Kristian Høgsberg's avatar
Kristian Høgsberg committed
12 13 14 15 16 17 18 19 20 21 22 23
#include "builtin.h"
#include "diff.h"
#include "diffcore.h"
#include "commit.h"
#include "revision.h"
#include "wt-status.h"
#include "run-command.h"
#include "refs.h"
#include "log-tree.h"
#include "strbuf.h"
#include "utf8.h"
#include "parse-options.h"
24
#include "string-list.h"
25
#include "rerere.h"
26
#include "unpack-trees.h"
Kristian Høgsberg's avatar
Kristian Høgsberg committed
27 28

static const char * const builtin_commit_usage[] = {
Stephan Beyer's avatar
Stephan Beyer committed
29
	"git commit [options] [--] <filepattern>...",
Kristian Høgsberg's avatar
Kristian Høgsberg committed
30 31 32
	NULL
};

33
static const char * const builtin_status_usage[] = {
Stephan Beyer's avatar
Stephan Beyer committed
34
	"git status [options] [--] <filepattern>...",
35 36 37
	NULL
};

Kristian Høgsberg's avatar
Kristian Høgsberg committed
38 39 40
static unsigned char head_sha1[20], merge_head_sha1[20];
static char *use_message_buffer;
static const char commit_editmsg[] = "COMMIT_EDITMSG";
41 42 43 44 45 46 47
static struct lock_file index_lock; /* real index */
static struct lock_file false_lock; /* used only for partial commits */
static enum {
	COMMIT_AS_IS = 1,
	COMMIT_NORMAL,
	COMMIT_PARTIAL,
} commit_style;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
48

49
static const char *logfile, *force_author;
50
static const char *template_file;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
51
static char *edit_message, *use_message;
52
static char *author_name, *author_email, *author_date;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
53
static int all, edit_flag, also, interactive, only, amend, signoff;
Junio C Hamano's avatar
Junio C Hamano committed
54
static int quiet, verbose, no_verify, allow_empty, dry_run;
55
static char *untracked_files_arg;
56 57 58 59 60 61 62 63 64 65 66 67 68
/*
 * The default commit message cleanup mode will remove the lines
 * beginning with # (shell comments) and leading and trailing
 * whitespaces (empty lines or containing only whitespaces)
 * if editor is used, and only the whitespaces if the message
 * is specified explicitly.
 */
static enum {
	CLEANUP_SPACE,
	CLEANUP_NONE,
	CLEANUP_ALL,
} cleanup_mode;
static char *cleanup_arg;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
69

70
static int use_editor = 1, initial_commit, in_merge;
71 72
static const char *only_include_assumed;
static struct strbuf message;
73 74 75 76 77 78 79 80

static int opt_parse_m(const struct option *opt, const char *arg, int unset)
{
	struct strbuf *buf = opt->value;
	if (unset)
		strbuf_setlen(buf, 0);
	else {
		strbuf_addstr(buf, arg);
81
		strbuf_addstr(buf, "\n\n");
82 83 84
	}
	return 0;
}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
85 86 87 88 89 90

static struct option builtin_commit_options[] = {
	OPT__QUIET(&quiet),
	OPT__VERBOSE(&verbose),
	OPT_GROUP("Commit message options"),

91
	OPT_FILENAME('F', "file", &logfile, "read log from file"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
92
	OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
93
	OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
94 95
	OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
	OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
96
	OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
97
	OPT_FILENAME('t', "template", &template_file, "use specified template file"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
98 99 100 101 102 103
	OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),

	OPT_GROUP("Commit contents options"),
	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
	OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
	OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
104
	OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
105
	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
Junio C Hamano's avatar
Junio C Hamano committed
106
	OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
107
	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
108
	{ 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" },
Junio C Hamano's avatar
Junio C Hamano committed
109
	OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
110
	OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
111 112 113 114

	OPT_END()
};

115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
static void rollback_index_files(void)
{
	switch (commit_style) {
	case COMMIT_AS_IS:
		break; /* nothing to do */
	case COMMIT_NORMAL:
		rollback_lock_file(&index_lock);
		break;
	case COMMIT_PARTIAL:
		rollback_lock_file(&index_lock);
		rollback_lock_file(&false_lock);
		break;
	}
}

130
static int commit_index_files(void)
131
{
132 133
	int err = 0;

134 135 136 137
	switch (commit_style) {
	case COMMIT_AS_IS:
		break; /* nothing to do */
	case COMMIT_NORMAL:
138
		err = commit_lock_file(&index_lock);
139 140
		break;
	case COMMIT_PARTIAL:
141
		err = commit_lock_file(&index_lock);
142 143 144
		rollback_lock_file(&false_lock);
		break;
	}
145 146

	return err;
147 148 149 150 151 152
}

/*
 * Take a union of paths in the index and the named tree (typically, "HEAD"),
 * and return the paths that match the given pattern in list.
 */
153
static int list_paths(struct string_list *list, const char *with_tree,
154 155 156 157 158 159 160 161 162 163 164 165 166 167
		      const char *prefix, const char **pattern)
{
	int i;
	char *m;

	for (i = 0; pattern[i]; i++)
		;
	m = xcalloc(1, i);

	if (with_tree)
		overlay_tree_on_cache(with_tree, prefix);

	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
168
		if (ce->ce_flags & CE_UPDATE)
169
			continue;
170
		if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
171
			continue;
172
		string_list_insert(ce->name, list);
173 174 175 176 177
	}

	return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
}

178
static void add_remove_files(struct string_list *list)
179 180 181
{
	int i;
	for (i = 0; i < list->nr; i++) {
182
		struct stat st;
183
		struct string_list_item *p = &(list->items[i]);
184

185 186
		if (!lstat(p->string, &st)) {
			if (add_to_cache(p->string, &st, 0))
187 188
				die("updating files failed");
		} else
189
			remove_file_from_cache(p->string);
190 191 192
	}
}

193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
static void create_base_index(void)
{
	struct tree *tree;
	struct unpack_trees_options opts;
	struct tree_desc t;

	if (initial_commit) {
		discard_cache();
		return;
	}

	memset(&opts, 0, sizeof(opts));
	opts.head_idx = 1;
	opts.index_only = 1;
	opts.merge = 1;
208 209
	opts.src_index = &the_index;
	opts.dst_index = &the_index;
210 211 212 213 214 215 216

	opts.fn = oneway_merge;
	tree = parse_tree_indirect(head_sha1);
	if (!tree)
		die("failed to unpack HEAD tree object");
	parse_tree(tree);
	init_tree_desc(&t, tree->buffer, tree->size);
217 218
	if (unpack_trees(1, &t, &opts))
		exit(128); /* We've already reported the error, finish dying */
219 220
}

221
static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
222 223
{
	int fd;
224
	struct string_list partial;
225
	const char **pathspec = NULL;
226
	int refresh_flags = REFRESH_QUIET;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
227

228 229
	if (is_status)
		refresh_flags |= REFRESH_UNMERGED;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
230
	if (interactive) {
231 232
		if (interactive_add(argc, argv, prefix) != 0)
			die("interactive add failed");
Linus Torvalds's avatar
Linus Torvalds committed
233
		if (read_cache_preload(NULL) < 0)
234
			die("index file corrupt");
235
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
236 237 238
		return get_index_file();
	}

239 240
	if (*argv)
		pathspec = get_pathspec(prefix, argv);
241

Linus Torvalds's avatar
Linus Torvalds committed
242 243 244
	if (read_cache_preload(pathspec) < 0)
		die("index file corrupt");

245 246 247 248 249 250 251 252 253 254 255 256 257 258
	/*
	 * Non partial, non as-is commit.
	 *
	 * (1) get the real index;
	 * (2) update the_index as necessary;
	 * (3) write the_index out to the real index (still locked);
	 * (4) return the name of the locked index file.
	 *
	 * The caller should run hooks on the locked real index, and
	 * (A) if all goes well, commit the real index;
	 * (B) on failure, rollback the real index.
	 */
	if (all || (also && pathspec && *pathspec)) {
		int fd = hold_locked_index(&index_lock, 1);
259
		add_files_to_cache(also ? prefix : NULL, pathspec, 0);
260
		refresh_cache(refresh_flags);
Brandon Casey's avatar
Brandon Casey committed
261 262
		if (write_cache(fd, active_cache, active_nr) ||
		    close_lock_file(&index_lock))
Kristian Høgsberg's avatar
Kristian Høgsberg committed
263
			die("unable to write new_index file");
264 265
		commit_style = COMMIT_NORMAL;
		return index_lock.filename;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
266 267
	}

268 269 270 271 272 273 274 275 276 277 278
	/*
	 * As-is commit.
	 *
	 * (1) return the name of the real index file.
	 *
	 * The caller should run hooks on the real index, and run
	 * hooks on the real index, and create commit from the_index.
	 * We still need to refresh the index here.
	 */
	if (!pathspec || !*pathspec) {
		fd = hold_locked_index(&index_lock, 1);
279
		refresh_cache(refresh_flags);
280
		if (write_cache(fd, active_cache, active_nr) ||
281
		    commit_locked_index(&index_lock))
282 283
			die("unable to write new_index file");
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
284 285 286
		return get_index_file();
	}

287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311
	/*
	 * A partial commit.
	 *
	 * (0) find the set of affected paths;
	 * (1) get lock on the real index file;
	 * (2) update the_index with the given paths;
	 * (3) write the_index out to the real index (still locked);
	 * (4) get lock on the false index file;
	 * (5) reset the_index from HEAD;
	 * (6) update the_index the same way as (2);
	 * (7) write the_index out to the false index file;
	 * (8) return the name of the false index file (still locked);
	 *
	 * The caller should run hooks on the locked false index, and
	 * create commit from it.  Then
	 * (A) if all goes well, commit the real index;
	 * (B) on failure, rollback the real index;
	 * In either case, rollback the false index.
	 */
	commit_style = COMMIT_PARTIAL;

	if (file_exists(git_path("MERGE_HEAD")))
		die("cannot do a partial commit during a merge.");

	memset(&partial, 0, sizeof(partial));
312
	partial.strdup_strings = 1;
313 314 315 316 317 318 319 320 321
	if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
		exit(1);

	discard_cache();
	if (read_cache() < 0)
		die("cannot read the index");

	fd = hold_locked_index(&index_lock, 1);
	add_remove_files(&partial);
322
	refresh_cache(REFRESH_QUIET);
Brandon Casey's avatar
Brandon Casey committed
323 324
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&index_lock))
Kristian Høgsberg's avatar
Kristian Høgsberg committed
325 326
		die("unable to write new_index file");

327
	fd = hold_lock_file_for_update(&false_lock,
328 329
				       git_path("next-index-%"PRIuMAX,
						(uintmax_t) getpid()),
330
				       LOCK_DIE_ON_ERROR);
331 332

	create_base_index();
333
	add_remove_files(&partial);
334
	refresh_cache(REFRESH_QUIET);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
335

Brandon Casey's avatar
Brandon Casey committed
336 337
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&false_lock))
338
		die("unable to write temporary index file");
339 340 341 342

	discard_cache();
	read_cache_from(false_lock.filename);

343
	return false_lock.filename;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
344 345
}

346 347
static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
		      struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
348
{
349 350
	if (s->relative_paths)
		s->prefix = prefix;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
351 352

	if (amend) {
353 354
		s->amend = 1;
		s->reference = "HEAD^1";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
355
	}
356 357 358 359
	s->verbose = verbose;
	s->index_file = index_file;
	s->fp = fp;
	s->nowarn = nowarn;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
360

361
	wt_status_print(s);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
362

363
	return s->commitable;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
364 365
}

366 367 368 369 370 371 372 373
static int is_a_merge(const unsigned char *sha1)
{
	struct commit *commit = lookup_commit(sha1);
	if (!commit || parse_commit(commit))
		die("could not parse HEAD commit");
	return !!(commit->parents && commit->parents->next);
}

Kristian Høgsberg's avatar
Kristian Høgsberg committed
374 375
static const char sign_off_header[] = "Signed-off-by: ";

376
static void determine_author_info(void)
377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411
{
	char *name, *email, *date;

	name = getenv("GIT_AUTHOR_NAME");
	email = getenv("GIT_AUTHOR_EMAIL");
	date = getenv("GIT_AUTHOR_DATE");

	if (use_message) {
		const char *a, *lb, *rb, *eol;

		a = strstr(use_message_buffer, "\nauthor ");
		if (!a)
			die("invalid commit: %s", use_message);

		lb = strstr(a + 8, " <");
		rb = strstr(a + 8, "> ");
		eol = strchr(a + 8, '\n');
		if (!lb || !rb || !eol)
			die("invalid commit: %s", use_message);

		name = xstrndup(a + 8, lb - (a + 8));
		email = xstrndup(lb + 2, rb - (lb + 2));
		date = xstrndup(rb + 2, eol - (rb + 2));
	}

	if (force_author) {
		const char *lb = strstr(force_author, " <");
		const char *rb = strchr(force_author, '>');

		if (!lb || !rb)
			die("malformed --author parameter");
		name = xstrndup(force_author, lb - force_author);
		email = xstrndup(lb + 2, rb - (lb + 2));
	}

412 413 414
	author_name = name;
	author_email = email;
	author_date = date;
415 416
}

417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457
static int ends_rfc2822_footer(struct strbuf *sb)
{
	int ch;
	int hit = 0;
	int i, j, k;
	int len = sb->len;
	int first = 1;
	const char *buf = sb->buf;

	for (i = len - 1; i > 0; i--) {
		if (hit && buf[i] == '\n')
			break;
		hit = (buf[i] == '\n');
	}

	while (i < len - 1 && buf[i] == '\n')
		i++;

	for (; i < len; i = k) {
		for (k = i; k < len && buf[k] != '\n'; k++)
			; /* do nothing */
		k++;

		if ((buf[k] == ' ' || buf[k] == '\t') && !first)
			continue;

		first = 0;

		for (j = 0; i + j < len; j++) {
			ch = buf[i + j];
			if (ch == ':')
				break;
			if (isalnum(ch) ||
			    (ch == '-'))
				continue;
			return 0;
		}
	}
	return 1;
}

458 459
static int prepare_to_commit(const char *index_file, const char *prefix,
			     struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
460 461
{
	struct stat statbuf;
462
	int commitable, saved_color_setting;
463
	struct strbuf sb = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
464 465
	char *buffer;
	FILE *fp;
466 467
	const char *hook_arg1 = NULL;
	const char *hook_arg2 = NULL;
468
	int ident_shown = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
469

470 471
	if (!no_verify && run_hook(index_file, "pre-commit", NULL))
		return 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
472

473 474
	if (message.len) {
		strbuf_addbuf(&sb, &message);
475
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
476 477 478 479
	} else if (logfile && !strcmp(logfile, "-")) {
		if (isatty(0))
			fprintf(stderr, "(reading log message from standard input)\n");
		if (strbuf_read(&sb, 0, 0) < 0)
480
			die_errno("could not read log from standard input");
481
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
482 483
	} else if (logfile) {
		if (strbuf_read_file(&sb, logfile, 0) < 0)
484 485
			die_errno("could not read log file '%s'",
				  logfile);
486
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
487 488 489 490 491
	} else if (use_message) {
		buffer = strstr(use_message_buffer, "\n\n");
		if (!buffer || buffer[2] == '\0')
			die("commit has empty message");
		strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
492 493
		hook_arg1 = "commit";
		hook_arg2 = use_message;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
494 495
	} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
496
			die_errno("could not read MERGE_MSG");
497
		hook_arg1 = "merge";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
498 499
	} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
500
			die_errno("could not read SQUASH_MSG");
501
		hook_arg1 = "squash";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
502 503
	} else if (template_file && !stat(template_file, &statbuf)) {
		if (strbuf_read_file(&sb, template_file, 0) < 0)
504
			die_errno("could not read '%s'", template_file);
505
		hook_arg1 = "template";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
506 507
	}

508 509 510 511 512 513 514
	/*
	 * This final case does not modify the template message,
	 * it just sets the argument to the prepare-commit-msg hook.
	 */
	else if (in_merge)
		hook_arg1 = "merge";

Kristian Høgsberg's avatar
Kristian Høgsberg committed
515 516
	fp = fopen(git_path(commit_editmsg), "w");
	if (fp == NULL)
517
		die_errno("could not open '%s'", git_path(commit_editmsg));
Kristian Høgsberg's avatar
Kristian Høgsberg committed
518

519 520
	if (cleanup_mode != CLEANUP_NONE)
		stripspace(&sb, 0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
521 522

	if (signoff) {
523
		struct strbuf sob = STRBUF_INIT;
524 525 526
		int i;

		strbuf_addstr(&sob, sign_off_header);
527 528
		strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
					     getenv("GIT_COMMITTER_EMAIL")));
529 530 531
		strbuf_addch(&sob, '\n');
		for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
			; /* do nothing */
532
		if (prefixcmp(sb.buf + i, sob.buf)) {
533
			if (!i || !ends_rfc2822_footer(&sb))
534
				strbuf_addch(&sb, '\n');
535
			strbuf_addbuf(&sb, &sob);
536
		}
537
		strbuf_release(&sob);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
538 539
	}

540
	if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
541
		die_errno("could not write commit template");
542

Kristian Høgsberg's avatar
Kristian Høgsberg committed
543 544
	strbuf_release(&sb);

545 546
	determine_author_info();

547 548
	/* This checks if committer ident is explicitly given */
	git_committer_info(0);
549
	if (use_editor) {
550 551 552
		char *author_ident;
		const char *committer_ident;

553 554 555 556 557 558 559 560 561 562 563 564
		if (in_merge)
			fprintf(fp,
				"#\n"
				"# It looks like you may be committing a MERGE.\n"
				"# If this is not correct, please remove the file\n"
				"#	%s\n"
				"# and try again.\n"
				"#\n",
				git_path("MERGE_HEAD"));

		fprintf(fp,
			"\n"
Jeff King's avatar
Jeff King committed
565
			"# Please enter the commit message for your changes.");
566
		if (cleanup_mode == CLEANUP_ALL)
Jeff King's avatar
Jeff King committed
567 568 569 570
			fprintf(fp,
				" Lines starting\n"
				"# with '#' will be ignored, and an empty"
				" message aborts the commit.\n");
571
		else /* CLEANUP_SPACE, that is. */
Jeff King's avatar
Jeff King committed
572 573 574 575 576
			fprintf(fp,
				" Lines starting\n"
				"# with '#' will be kept; you may remove them"
				" yourself if you want to.\n"
				"# An empty message aborts the commit.\n");
577 578 579
		if (only_include_assumed)
			fprintf(fp, "# %s\n", only_include_assumed);

580 581 582 583 584
		author_ident = xstrdup(fmt_name(author_name, author_email));
		committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
					   getenv("GIT_COMMITTER_EMAIL"));
		if (strcmp(author_ident, committer_ident))
			fprintf(fp,
585 586 587
				"%s"
				"# Author:    %s\n",
				ident_shown++ ? "" : "#\n",
588 589 590
				author_ident);
		free(author_ident);

591 592 593 594 595 596 597 598 599 600
		if (!user_ident_explicitly_given)
			fprintf(fp,
				"%s"
				"# Committer: %s\n",
				ident_shown++ ? "" : "#\n",
				committer_ident);

		if (ident_shown)
			fprintf(fp, "#\n");

601 602 603 604
		saved_color_setting = s->use_color;
		s->use_color = 0;
		commitable = run_status(fp, index_file, prefix, 1, s);
		s->use_color = saved_color_setting;
605
	} else {
606
		unsigned char sha1[20];
607
		const char *parent = "HEAD";
608 609 610 611

		if (!active_nr && read_cache() < 0)
			die("Cannot read index");

612 613 614
		if (amend)
			parent = "HEAD^1";

615
		if (get_sha1(parent, sha1))
616
			commitable = !!active_nr;
617 618
		else
			commitable = index_differs_from(parent, 0);
619
	}
620

621
	fclose(fp);
622

623 624
	if (!commitable && !in_merge && !allow_empty &&
	    !(amend && is_a_merge(head_sha1))) {
625
		run_status(stdout, index_file, prefix, 0, s);
626
		return 0;
627 628
	}

629 630 631 632 633 634 635 636 637 638 639
	/*
	 * Re-read the index as pre-commit hook could have updated it,
	 * and write it out as a tree.  We must do this before we invoke
	 * the editor and after we invoke run_status above.
	 */
	discard_cache();
	read_cache_from(index_file);
	if (!active_cache_tree)
		active_cache_tree = cache_tree();
	if (cache_tree_update(active_cache_tree,
			      active_cache, active_nr, 0, 0) < 0) {
640
		error("Error building trees");
641
		return 0;
642
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
643

644 645 646
	if (run_hook(index_file, "prepare-commit-msg",
		     git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
		return 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
647

648 649 650 651
	if (use_editor) {
		char index[PATH_MAX];
		const char *env[2] = { index, NULL };
		snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
652 653 654 655 656
		if (launch_editor(git_path(commit_editmsg), NULL, env)) {
			fprintf(stderr,
			"Please supply the message using either -m or -F option.\n");
			exit(1);
		}
657
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
658

659 660 661 662
	if (!no_verify &&
	    run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
		return 0;
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
663

664
	return 1;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
665 666 667
}

/*
668 669
 * Find out if the message in the strbuf contains only whitespace and
 * Signed-off-by lines.
Kristian Høgsberg's avatar
Kristian Høgsberg committed
670
 */
671
static int message_is_empty(struct strbuf *sb)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
672
{
673
	struct strbuf tmpl = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
674
	const char *nl;
675
	int eol, i, start = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
676

677 678 679
	if (cleanup_mode == CLEANUP_NONE && sb->len)
		return 0;

Kristian Høgsberg's avatar
Kristian Høgsberg committed
680 681
	/* See if the template is just a prefix of the message. */
	if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
682
		stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709
		if (start + tmpl.len <= sb->len &&
		    memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
			start += tmpl.len;
	}
	strbuf_release(&tmpl);

	/* Check if the rest is just whitespace and Signed-of-by's. */
	for (i = start; i < sb->len; i++) {
		nl = memchr(sb->buf + i, '\n', sb->len - i);
		if (nl)
			eol = nl - sb->buf;
		else
			eol = sb->len;

		if (strlen(sign_off_header) <= eol - i &&
		    !prefixcmp(sb->buf + i, sign_off_header)) {
			i = eol;
			continue;
		}
		while (i < eol)
			if (!isspace(sb->buf[i++]))
				return 0;
	}

	return 1;
}

710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734
static const char *find_author_by_nickname(const char *name)
{
	struct rev_info revs;
	struct commit *commit;
	struct strbuf buf = STRBUF_INIT;
	const char *av[20];
	int ac = 0;

	init_revisions(&revs, NULL);
	strbuf_addf(&buf, "--author=%s", name);
	av[++ac] = "--all";
	av[++ac] = "-i";
	av[++ac] = buf.buf;
	av[++ac] = NULL;
	setup_revisions(ac, av, &revs, NULL);
	prepare_revision_walk(&revs);
	commit = get_revision(&revs);
	if (commit) {
		strbuf_release(&buf);
		format_commit_message(commit, "%an <%ae>", &buf, DATE_NORMAL);
		return strbuf_detach(&buf, NULL);
	}
	die("No existing author found with '%s'", name);
}

735
static int parse_and_validate_options(int argc, const char *argv[],
736
				      const char * const usage[],
737 738
				      const char *prefix,
				      struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
739 740 741
{
	int f = 0;

742 743
	argc = parse_options(argc, argv, prefix, builtin_commit_options, usage,
			     0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
744

745 746 747
	if (force_author && !strchr(force_author, '>'))
		force_author = find_author_by_nickname(force_author);

748
	if (logfile || message.len || use_message)
749
		use_editor = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
750
	if (edit_flag)
751
		use_editor = 1;
752 753
	if (!use_editor)
		setenv("GIT_EDITOR", ":", 1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
754 755 756 757 758 759 760 761 762 763 764

	if (get_sha1("HEAD", head_sha1))
		initial_commit = 1;

	if (!get_sha1("MERGE_HEAD", merge_head_sha1))
		in_merge = 1;

	/* Sanity check options */
	if (amend && initial_commit)
		die("You have nothing to amend.");
	if (amend && in_merge)
765
		die("You are in the middle of a merge -- cannot amend.");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
766 767 768 769 770 771 772 773 774

	if (use_message)
		f++;
	if (edit_message)
		f++;
	if (logfile)
		f++;
	if (f > 1)
		die("Only one of -c/-C/-F can be used.");
775
	if (message.len && f > 0)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
776 777 778
		die("Option -m cannot be combined with -c/-C/-F.");
	if (edit_message)
		use_message = edit_message;
779
	if (amend && !use_message)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
780 781 782 783 784 785 786 787 788 789
		use_message = "HEAD";
	if (use_message) {
		unsigned char sha1[20];
		static char utf8[] = "UTF-8";
		const char *out_enc;
		char *enc, *end;
		struct commit *commit;

		if (get_sha1(use_message, sha1))
			die("could not lookup commit %s", use_message);
Junio C Hamano's avatar
Junio C Hamano committed
790
		commit = lookup_commit_reference(sha1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824
		if (!commit || parse_commit(commit))
			die("could not parse commit %s", use_message);

		enc = strstr(commit->buffer, "\nencoding");
		if (enc) {
			end = strchr(enc + 10, '\n');
			enc = xstrndup(enc + 10, end - (enc + 10));
		} else {
			enc = utf8;
		}
		out_enc = git_commit_encoding ? git_commit_encoding : utf8;

		if (strcmp(out_enc, enc))
			use_message_buffer =
				reencode_string(commit->buffer, out_enc, enc);

		/*
		 * If we failed to reencode the buffer, just copy it
		 * byte for byte so the user can try to fix it up.
		 * This also handles the case where input and output
		 * encodings are identical.
		 */
		if (use_message_buffer == NULL)
			use_message_buffer = xstrdup(commit->buffer);
		if (enc != utf8)
			free(enc);
	}

	if (!!also + !!only + !!all + !!interactive > 1)
		die("Only one of --include/--only/--all/--interactive can be used.");
	if (argc == 0 && (also || (only && !amend)))
		die("No paths with --include/--only does not make sense.");
	if (argc == 0 && only && amend)
		only_include_assumed = "Clever... amending the last one with dirty index.";
825
	if (argc > 0 && !also && !only)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
826
		only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
827 828 829 830 831 832 833 834 835 836
	if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
		cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
	else if (!strcmp(cleanup_arg, "verbatim"))
		cleanup_mode = CLEANUP_NONE;
	else if (!strcmp(cleanup_arg, "whitespace"))
		cleanup_mode = CLEANUP_SPACE;
	else if (!strcmp(cleanup_arg, "strip"))
		cleanup_mode = CLEANUP_ALL;
	else
		die("Invalid cleanup mode %s", cleanup_arg);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
837

838 839
	if (!untracked_files_arg)
		; /* default already initialized */
840
	else if (!strcmp(untracked_files_arg, "no"))
841
		s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
842
	else if (!strcmp(untracked_files_arg, "normal"))
843
		s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
844
	else if (!strcmp(untracked_files_arg, "all"))
845
		s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
846 847 848
	else
		die("Invalid untracked files mode '%s'", untracked_files_arg);

Kristian Høgsberg's avatar
Kristian Høgsberg committed
849 850 851 852 853 854 855 856
	if (all && argc > 0)
		die("Paths with -a does not make sense.");
	else if (interactive && argc > 0)
		die("Paths with --interactive does not make sense.");

	return argc;
}

857 858
static int dry_run_commit(int argc, const char **argv, const char *prefix,
			  struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
859 860
{
	int commitable;
Junio C Hamano's avatar
Junio C Hamano committed
861
	const char *index_file;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
862

Junio C Hamano's avatar
Junio C Hamano committed
863
	index_file = prepare_index(argc, argv, prefix, 1);
864
	commitable = run_status(stdout, index_file, prefix, 0, s);
Junio C Hamano's avatar
Junio C Hamano committed
865
	rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
866

Junio C Hamano's avatar
Junio C Hamano committed
867 868 869
	return commitable ? 0 : 1;
}

870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929
static int parse_status_slot(const char *var, int offset)
{
	if (!strcasecmp(var+offset, "header"))
		return WT_STATUS_HEADER;
	if (!strcasecmp(var+offset, "updated")
		|| !strcasecmp(var+offset, "added"))
		return WT_STATUS_UPDATED;
	if (!strcasecmp(var+offset, "changed"))
		return WT_STATUS_CHANGED;
	if (!strcasecmp(var+offset, "untracked"))
		return WT_STATUS_UNTRACKED;
	if (!strcasecmp(var+offset, "nobranch"))
		return WT_STATUS_NOBRANCH;
	if (!strcasecmp(var+offset, "unmerged"))
		return WT_STATUS_UNMERGED;
	die("bad config variable '%s'", var);
}

static int git_status_config(const char *k, const char *v, void *cb)
{
	struct wt_status *s = cb;

	if (!strcmp(k, "status.submodulesummary")) {
		int is_bool;
		s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
		if (is_bool && s->submodule_summary)
			s->submodule_summary = -1;
		return 0;
	}
	if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
		s->use_color = git_config_colorbool(k, v, -1);
		return 0;
	}
	if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
		int slot = parse_status_slot(k, 13);
		if (!v)
			return config_error_nonbool(k);
		color_parse(v, k, s->color_palette[slot]);
		return 0;
	}
	if (!strcmp(k, "status.relativepaths")) {
		s->relative_paths = git_config_bool(k, v);
		return 0;
	}
	if (!strcmp(k, "status.showuntrackedfiles")) {
		if (!v)
			return config_error_nonbool(k);
		else if (!strcmp(v, "no"))
			s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
		else if (!strcmp(v, "normal"))
			s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
		else if (!strcmp(v, "all"))
			s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
		else
			return error("Invalid untracked files mode '%s'", v);
		return 0;
	}
	return git_diff_ui_config(k, v, NULL);
}

Junio C Hamano's avatar
Junio C Hamano committed
930 931
int cmd_status(int argc, const char **argv, const char *prefix)
{
932 933 934 935 936 937
	struct wt_status s;

	wt_status_prepare(&s);
	git_config(git_status_config, &s);
	if (s.use_color == -1)
		s.use_color = git_use_color_default;
938 939 940
	if (diff_use_color_default == -1)
		diff_use_color_default = git_use_color_default;

941 942 943
	argc = parse_and_validate_options(argc, argv, builtin_status_usage,
					  prefix, &s);
	return dry_run_commit(argc, argv, prefix, &s);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
944 945 946 947 948 949
}

static void print_summary(const char *prefix, const unsigned char *sha1)
{
	struct rev_info rev;
	struct commit *commit;
950
	static const char *format = "format:%h] %s";
951 952
	unsigned char junk_sha1[20];
	const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
953 954 955

	commit = lookup_commit(sha1);
	if (!commit)
956
		die("couldn't look up newly created commit");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
957 958 959 960 961 962 963 964 965 966 967 968 969
	if (!commit || parse_commit(commit))
		die("could not parse newly created commit");

	init_revisions(&rev, prefix);
	setup_revisions(0, NULL, &rev, NULL);

	rev.abbrev = 0;
	rev.diff = 1;
	rev.diffopt.output_format =
		DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;

	rev.verbose_header = 1;
	rev.show_root_diff = 1;
970
	get_commit_format(format, &rev);
971
	rev.always_show_header = 0;
972 973 974
	rev.diffopt.detect_rename = 1;
	rev.diffopt.rename_limit = 100;
	rev.diffopt.break_opt = 0;
975
	diff_setup_done(&rev.diffopt);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
976

977
	printf("[%s%s ",
978 979 980 981 982 983
		!prefixcmp(head, "refs/heads/") ?
			head + 11 :
			!strcmp(head, "HEAD") ?
				"detached HEAD" :
				head,
		initial_commit ? " (root-commit)" : "");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
984

985 986
	if (!log_tree_commit(&rev, commit)) {
		struct strbuf buf = STRBUF_INIT;
987
		format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
988 989 990
		printf("%s\n", buf.buf);
		strbuf_release(&buf);
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
991 992
}

993
static int git_commit_config(const char *k, const char *v, void *cb)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
994
{
995 996
	struct wt_status *s = cb;

997 998
	if (!strcmp(k, "commit.template"))
		return git_config_string(&template_file, k, v);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
999

1000
	return git_status_config(k, v, s);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1001 1002 1003 1004
}

int cmd_commit(int argc, const char **argv, const char *prefix)
{
1005
	struct strbuf sb = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1006
	const char *index_file, *reflog_msg;
1007
	char *nl, *p;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1008 1009
	unsigned char commit_sha1[20];
	struct ref_lock *ref_lock;
1010
	struct commit_list *parents = NULL, **pptr = &parents;
1011 1012
	struct stat statbuf;
	int allow_fast_forward = 1;
1013
	struct wt_status s;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1014

1015 1016
	wt_status_prepare(&s);
	git_config(git_commit_config, &s);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1017

1018 1019
	if (s.use_color == -1)
		s.use_color = git_use_color_default;
1020

1021 1022
	argc = parse_and_validate_options(argc, argv, builtin_commit_usage,
					  prefix, &s);
1023 1024 1025
	if (dry_run) {
		if (diff_use_color_default == -1)
			diff_use_color_default = git_use_color_default;
1026
		return dry_run_commit(argc, argv, prefix, &s);
1027
	}
1028
	index_file = prepare_index(argc, argv, prefix, 0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1029

1030 1031
	/* Set up everything for writing the commit object.  This includes
	   running hooks, writing the trees, and interacting with the user.  */
1032
	if (!prepare_to_commit(index_file, prefix, &s)) {
1033
		rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
		return 1;
	}

	/* Determine parents */
	if (initial_commit) {
		reflog_msg = "commit (initial)";
	} else if (amend) {
		struct commit_list *c;
		struct commit *commit;

		reflog_msg = "commit (amend)";
		commit = lookup_commit(head_sha1);
		if (!commit || parse_commit(commit))
			die("could not parse HEAD commit");

		for (c = commit->parents; c; c = c->next)
1050
			pptr = &commit_list_insert(c->item, pptr)->next;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1051
	} else if (in_merge) {
1052
		struct strbuf m = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1053 1054 1055
		FILE *fp;

		reflog_msg = "commit (merge)";
1056
		pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1057 1058
		fp = fopen(git_path("MERGE_HEAD"), "r");
		if (fp == NULL)
1059 1060
			die_errno("could not open '%s' for reading",
				  git_path("MERGE_HEAD"));
1061 1062 1063 1064
		while (strbuf_getline(&m, fp, '\n') != EOF) {
			unsigned char sha1[20];
			if (get_sha1_hex(m.buf, sha1) < 0)
				die("Corrupt MERGE_HEAD file (%s)", m.buf);
1065
			pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
1066
		}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1067 1068
		fclose(fp);
		strbuf_release(&m);
1069 1070
		if (!stat(git_path("MERGE_MODE"), &statbuf)) {
			if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
1071
				die_errno("could not read MERGE_MODE");
1072 1073 1074 1075 1076
			if (!strcmp(sb.buf, "no-ff"))
				allow_fast_forward = 0;
		}
		if (allow_fast_forward)
			parents = reduce_heads(parents);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1077 1078
	} else {
		reflog_msg = "commit";
1079
		pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1080 1081
	}

1082
	/* Finally, get the commit message */
1083
	strbuf_reset(&sb);
1084
	if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
1085
		int saved_errno = errno;
1086
		rollback_index_files();
1087
		die("could not read commit message: %s", strerror(saved_errno));
1088
	}
1089 1090

	/* Truncate the message just before the diff, if any. */
1091 1092 1093 1094 1095
	if (verbose) {
		p = strstr(sb.buf, "\ndiff --git ");
		if (p != NULL)
			strbuf_setlen(&sb, p - sb.buf + 1);
	}
1096

1097 1098
	if (cleanup_mode != CLEANUP_NONE)
		stripspace(&sb, cleanup_mode == CLEANUP_ALL);
1099
	if (message_is_empty(&sb)) {
1100
		rollback_index_files();
Jeff King's avatar
Jeff King committed
1101 1102
		fprintf(stderr, "Aborting commit due to empty commit message.\n");
		exit(1);
1103
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1104

1105 1106 1107
	if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
			fmt_ident(author_name, author_email, author_date,
				IDENT_ERROR_ON_NO_NAME))) {
1108
		rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1109
		die("failed to write commit object");
1110
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1111 1112 1113 1114 1115

	ref_lock = lock_any_ref_for_update("HEAD",
					   initial_commit ? NULL : head_sha1,
					   0);

1116
	nl = strchr(sb.buf, '\n');
1117 1118 1119 1120 1121 1122
	if (nl)
		strbuf_setlen(&sb, nl + 1 - sb.buf);
	else
		strbuf_addch(&sb, '\n');
	strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
	strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1123

1124 1125
	if (!ref_lock) {
		rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1126
		die("cannot lock HEAD ref");
1127 1128 1129
	}
	if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
		rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1130
		die("cannot update HEAD ref");
1131
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1132 1133 1134

	unlink(git_path("MERGE_HEAD"));
	unlink(git_path("MERGE_MSG"));
1135
	unlink(git_path("MERGE_MODE"));
1136
	unlink(git_path("SQUASH_MSG"));
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1137

1138 1139 1140 1141
	if (commit_index_files())
		die ("Repository has been updated, but unable to write\n"
		     "new_index file. Check that disk is not full or quota is\n"
		     "not exceeded, and then \"git reset HEAD\" to recover.");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1142 1143

	rerere();
1144
	run_hook(get_index_file(), "post-commit", NULL);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1145 1146 1147 1148 1149
	if (!quiet)
		print_summary(prefix, commit_sha1);

	return 0;
}