builtin-commit.c 22.5 KB
Newer Older
K
Kristian Høgsberg 已提交
1 2 3 4 5 6 7 8 9
/*
 * Builtin "git commit"
 *
 * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
 */

#include "cache.h"
#include "cache-tree.h"
10
#include "dir.h"
K
Kristian Høgsberg 已提交
11 12 13 14 15 16 17 18 19 20 21 22
#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"
23
#include "path-list.h"
K
Kristian Høgsberg 已提交
24 25 26 27 28 29

static const char * const builtin_commit_usage[] = {
	"git-commit [options] [--] <filepattern>...",
	NULL
};

30 31 32 33 34
static const char * const builtin_status_usage[] = {
	"git-status [options] [--] <filepattern>...",
	NULL
};

K
Kristian Høgsberg 已提交
35 36 37
static unsigned char head_sha1[20], merge_head_sha1[20];
static char *use_message_buffer;
static const char commit_editmsg[] = "COMMIT_EDITMSG";
38 39 40 41 42 43 44
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;
K
Kristian Høgsberg 已提交
45

46
static char *logfile, *force_author, *template_file;
K
Kristian Høgsberg 已提交
47 48
static char *edit_message, *use_message;
static int all, edit_flag, also, interactive, only, amend, signoff;
J
Junio C Hamano 已提交
49
static int quiet, verbose, untracked_files, no_verify, allow_empty;
K
Kristian Høgsberg 已提交
50 51 52

static int no_edit, initial_commit, in_merge;
const char *only_include_assumed;
53 54 55 56 57 58 59 60 61 62 63 64 65 66
struct strbuf message;

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);
		strbuf_addch(buf, '\n');
		strbuf_addch(buf, '\n');
	}
	return 0;
}
K
Kristian Høgsberg 已提交
67 68 69 70 71 72 73 74

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

	OPT_STRING('F', "file", &logfile, "FILE", "read log from file"),
	OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
75
	OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
K
Kristian Høgsberg 已提交
76 77 78 79 80 81 82 83 84 85 86 87 88 89
	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"),
	OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"),
	OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"),
	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"),
	OPT_BOOLEAN('o', "only", &only, ""),
	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
	OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"),
J
Junio C Hamano 已提交
90
	OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
K
Kristian Høgsberg 已提交
91 92 93 94

	OPT_END()
};

95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
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;
	}
}

static void commit_index_files(void)
{
	switch (commit_style) {
	case COMMIT_AS_IS:
		break; /* nothing to do */
	case COMMIT_NORMAL:
		commit_lock_file(&index_lock);
		break;
	case COMMIT_PARTIAL:
		commit_lock_file(&index_lock);
		rollback_lock_file(&false_lock);
		break;
	}
}

/*
 * 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.
 */
static int list_paths(struct path_list *list, const char *with_tree,
		      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];
		if (ce->ce_flags & htons(CE_UPDATE))
			continue;
		if (!pathspec_match(pattern, m, ce->name, 0))
			continue;
		path_list_insert(ce->name, list);
	}

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

static void add_remove_files(struct path_list *list)
{
	int i;
	for (i = 0; i < list->nr; i++) {
		struct path_list_item *p = &(list->items[i]);
		if (file_exists(p->path))
			add_file_to_cache(p->path, 0);
		else
			remove_file_from_cache(p->path);
	}
}

166
static char *prepare_index(int argc, const char **argv, const char *prefix)
K
Kristian Høgsberg 已提交
167 168 169
{
	int fd;
	struct tree *tree;
170 171
	struct path_list partial;
	const char **pathspec = NULL;
K
Kristian Høgsberg 已提交
172 173

	if (interactive) {
174
		interactive_add(argc, argv, prefix);
175
		commit_style = COMMIT_AS_IS;
K
Kristian Høgsberg 已提交
176 177 178 179 180 181
		return get_index_file();
	}

	if (read_cache() < 0)
		die("index file corrupt");

182 183
	if (*argv)
		pathspec = get_pathspec(prefix, argv);
184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199

	/*
	 * 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);
		add_files_to_cache(0, also ? prefix : NULL, pathspec);
200
		refresh_cache(REFRESH_QUIET);
K
Kristian Høgsberg 已提交
201 202
		if (write_cache(fd, active_cache, active_nr) || close(fd))
			die("unable to write new_index file");
203 204
		commit_style = COMMIT_NORMAL;
		return index_lock.filename;
K
Kristian Høgsberg 已提交
205 206
	}

207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222
	/*
	 * 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);
		refresh_cache(REFRESH_QUIET);
		if (write_cache(fd, active_cache, active_nr) ||
		    close(fd) || commit_locked_index(&index_lock))
			die("unable to write new_index file");
		commit_style = COMMIT_AS_IS;
K
Kristian Høgsberg 已提交
223 224 225
		return get_index_file();
	}

226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260
	/*
	 * 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));
	partial.strdup_paths = 1;
	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);
261
	refresh_cache(REFRESH_QUIET);
K
Kristian Høgsberg 已提交
262 263 264
	if (write_cache(fd, active_cache, active_nr) || close(fd))
		die("unable to write new_index file");

265 266 267
	fd = hold_lock_file_for_update(&false_lock,
				       git_path("next-index-%d", getpid()), 1);
	discard_cache();
K
Kristian Høgsberg 已提交
268 269 270 271 272 273 274
	if (!initial_commit) {
		tree = parse_tree_indirect(head_sha1);
		if (!tree)
			die("failed to unpack HEAD tree object");
		if (read_tree(tree, 0, NULL))
			die("failed to read HEAD tree object");
	}
275
	add_remove_files(&partial);
276
	refresh_cache(REFRESH_QUIET);
K
Kristian Høgsberg 已提交
277

278 279 280
	if (write_cache(fd, active_cache, active_nr) || close(fd))
		die("unable to write temporary index file");
	return false_lock.filename;
K
Kristian Høgsberg 已提交
281 282
}

283
static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn)
K
Kristian Høgsberg 已提交
284 285 286 287
{
	struct wt_status s;

	wt_status_prepare(&s);
288 289
	if (wt_status_relative_paths)
		s.prefix = prefix;
K
Kristian Høgsberg 已提交
290 291 292 293 294 295 296 297 298

	if (amend) {
		s.amend = 1;
		s.reference = "HEAD^1";
	}
	s.verbose = verbose;
	s.untracked = untracked_files;
	s.index_file = index_file;
	s.fp = fp;
299
	s.nowarn = nowarn;
K
Kristian Høgsberg 已提交
300 301 302 303 304 305 306 307

	wt_status_print(&s);

	return s.commitable;
}

static const char sign_off_header[] = "Signed-off-by: ";

308
static int prepare_log_message(const char *index_file, const char *prefix)
K
Kristian Høgsberg 已提交
309 310
{
	struct stat statbuf;
311
	int commitable, saved_color_setting;
K
Kristian Høgsberg 已提交
312 313 314 315 316
	struct strbuf sb;
	char *buffer;
	FILE *fp;

	strbuf_init(&sb, 0);
317 318
	if (message.len) {
		strbuf_addbuf(&sb, &message);
K
Kristian Høgsberg 已提交
319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346
	} else if (logfile && !strcmp(logfile, "-")) {
		if (isatty(0))
			fprintf(stderr, "(reading log message from standard input)\n");
		if (strbuf_read(&sb, 0, 0) < 0)
			die("could not read log from standard input");
	} else if (logfile) {
		if (strbuf_read_file(&sb, logfile, 0) < 0)
			die("could not read log file '%s': %s",
			    logfile, strerror(errno));
	} 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));
	} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
			die("could not read MERGE_MSG: %s", strerror(errno));
	} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
			die("could not read SQUASH_MSG: %s", strerror(errno));
	} else if (template_file && !stat(template_file, &statbuf)) {
		if (strbuf_read_file(&sb, template_file, 0) < 0)
			die("could not read %s: %s",
			    template_file, strerror(errno));
	}

	fp = fopen(git_path(commit_editmsg), "w");
	if (fp == NULL)
J
Jeff King 已提交
347
		die("could not open %s", git_path(commit_editmsg));
K
Kristian Høgsberg 已提交
348 349 350 351

	stripspace(&sb, 0);

	if (signoff) {
352 353 354 355 356
		struct strbuf sob;
		int i;

		strbuf_init(&sob, 0);
		strbuf_addstr(&sob, sign_off_header);
357 358
		strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
					     getenv("GIT_COMMITTER_EMAIL")));
359 360 361
		strbuf_addch(&sob, '\n');
		for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
			; /* do nothing */
362 363 364
		if (prefixcmp(sb.buf + i, sob.buf)) {
			if (prefixcmp(sb.buf + i, sign_off_header))
				strbuf_addch(&sb, '\n');
365
			strbuf_addbuf(&sb, &sob);
366
		}
367
		strbuf_release(&sob);
K
Kristian Høgsberg 已提交
368 369
	}

370
	if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
J
Jeff King 已提交
371
		die("could not write commit template: %s", strerror(errno));
372

K
Kristian Høgsberg 已提交
373 374
	strbuf_release(&sb);

375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
	if (no_edit) {
		struct rev_info rev;
		unsigned char sha1[40];

		fclose(fp);

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

		if (get_sha1("HEAD", sha1) != 0)
			return !!active_nr;

		init_revisions(&rev, "");
		rev.abbrev = 0;
		setup_revisions(0, NULL, &rev, "HEAD");
		DIFF_OPT_SET(&rev.diffopt, QUIET);
		DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
		run_diff_index(&rev, 1 /* cached */);

		return !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
	}

K
Kristian Høgsberg 已提交
397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413
	if (in_merge && !no_edit)
		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"
		"# Please enter the commit message for your changes.\n"
		"# (Comment lines starting with '#' will not be included)\n");
	if (only_include_assumed)
		fprintf(fp, "# %s\n", only_include_assumed);

414 415
	saved_color_setting = wt_status_use_color;
	wt_status_use_color = 0;
416
	commitable = run_status(fp, index_file, prefix, 1);
417
	wt_status_use_color = saved_color_setting;
K
Kristian Høgsberg 已提交
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 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477

	fclose(fp);

	return commitable;
}

/*
 * Find out if the message starting at position 'start' in the strbuf
 * contains only whitespace and Signed-off-by lines.
 */
static int message_is_empty(struct strbuf *sb, int start)
{
	struct strbuf tmpl;
	const char *nl;
	int eol, i;

	/* See if the template is just a prefix of the message. */
	strbuf_init(&tmpl, 0);
	if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
		stripspace(&tmpl, 1);
		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;
}

static void determine_author_info(struct strbuf *sb)
{
	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)
J
Jeff King 已提交
478
			die("invalid commit: %s", use_message);
K
Kristian Høgsberg 已提交
479 480 481 482 483

		lb = strstr(a + 8, " <");
		rb = strstr(a + 8, "> ");
		eol = strchr(a + 8, '\n');
		if (!lb || !rb || !eol)
J
Jeff King 已提交
484
			die("invalid commit: %s", use_message);
K
Kristian Høgsberg 已提交
485 486 487 488 489 490 491 492 493 494 495

		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)
J
Jeff King 已提交
496
			die("malformed --author parameter");
K
Kristian Høgsberg 已提交
497 498 499 500
		name = xstrndup(force_author, lb - force_author);
		email = xstrndup(lb + 2, rb - (lb + 2));
	}

501
	strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, IDENT_ERROR_ON_NO_NAME));
K
Kristian Høgsberg 已提交
502 503
}

504 505
static int parse_and_validate_options(int argc, const char *argv[],
				      const char * const usage[])
K
Kristian Høgsberg 已提交
506 507 508
{
	int f = 0;

509
	argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
K
Kristian Høgsberg 已提交
510

511
	if (logfile || message.len || use_message)
K
Kristian Høgsberg 已提交
512 513 514 515 516 517 518 519 520 521 522 523 524 525
		no_edit = 1;
	if (edit_flag)
		no_edit = 0;

	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)
J
Jeff King 已提交
526
		die("You are in the middle of a merge -- cannot amend.");
K
Kristian Høgsberg 已提交
527 528 529 530 531 532 533 534 535

	if (use_message)
		f++;
	if (edit_message)
		f++;
	if (logfile)
		f++;
	if (f > 1)
		die("Only one of -c/-C/-F can be used.");
536
	if (message.len && f > 0)
K
Kristian Høgsberg 已提交
537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605
		die("Option -m cannot be combined with -c/-C/-F.");
	if (edit_message)
		use_message = edit_message;
	if (amend)
		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);
		commit = lookup_commit(sha1);
		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.";
	if (argc > 0 && !also && !only) {
		only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
		also = 0;
	}

	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;
}

int cmd_status(int argc, const char **argv, const char *prefix)
{
	const char *index_file;
	int commitable;

	git_config(git_status_config);

606
	argc = parse_and_validate_options(argc, argv, builtin_status_usage);
K
Kristian Høgsberg 已提交
607

608
	index_file = prepare_index(argc, argv, prefix);
K
Kristian Høgsberg 已提交
609

610
	commitable = run_status(stdout, index_file, prefix, 0);
K
Kristian Høgsberg 已提交
611

612
	rollback_index_files();
K
Kristian Høgsberg 已提交
613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648

	return commitable ? 0 : 1;
}

static int run_hook(const char *index_file, const char *name, const char *arg)
{
	struct child_process hook;
	const char *argv[3], *env[2];
	char index[PATH_MAX];

	argv[0] = git_path("hooks/%s", name);
	argv[1] = arg;
	argv[2] = NULL;
	snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
	env[0] = index;
	env[1] = NULL;

	if (access(argv[0], X_OK) < 0)
		return 0;

	memset(&hook, 0, sizeof(hook));
	hook.argv = argv;
	hook.no_stdin = 1;
	hook.stdout_to_stderr = 1;
	hook.env = env;

	return run_command(&hook);
}

static void print_summary(const char *prefix, const unsigned char *sha1)
{
	struct rev_info rev;
	struct commit *commit;

	commit = lookup_commit(sha1);
	if (!commit)
J
Jeff King 已提交
649
		die("couldn't look up newly created commit");
K
Kristian Høgsberg 已提交
650 651 652 653 654 655 656 657 658 659 660 661 662 663
	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;
	rev.commit_format = get_commit_format("format:%h: %s");
664
	rev.always_show_header = 0;
K
Kristian Høgsberg 已提交
665 666 667

	printf("Created %scommit ", initial_commit ? "initial " : "");

668 669 670 671 672 673
	if (!log_tree_commit(&rev, commit)) {
		struct strbuf buf = STRBUF_INIT;
		format_commit_message(commit, "%h: %s", &buf);
		printf("%s\n", buf.buf);
		strbuf_release(&buf);
	}
K
Kristian Høgsberg 已提交
674 675 676 677 678 679 680 681 682 683 684 685
}

int git_commit_config(const char *k, const char *v)
{
	if (!strcmp(k, "commit.template")) {
		template_file = xstrdup(v);
		return 0;
	}

	return git_status_config(k, v);
}

686 687 688 689 690 691 692 693
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);
}

K
Kristian Høgsberg 已提交
694 695 696 697 698 699 700
static const char commit_utf8_warn[] =
"Warning: commit message does not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n";

int cmd_commit(int argc, const char **argv, const char *prefix)
{
701
	int header_len;
K
Kristian Høgsberg 已提交
702 703
	struct strbuf sb;
	const char *index_file, *reflog_msg;
704
	char *nl, *p;
K
Kristian Høgsberg 已提交
705 706 707 708 709
	unsigned char commit_sha1[20];
	struct ref_lock *ref_lock;

	git_config(git_commit_config);

710
	argc = parse_and_validate_options(argc, argv, builtin_commit_usage);
K
Kristian Høgsberg 已提交
711

712
	index_file = prepare_index(argc, argv, prefix);
K
Kristian Høgsberg 已提交
713

714 715 716 717
	if (!no_verify && run_hook(index_file, "pre-commit", NULL)) {
		rollback_index_files();
		return 1;
	}
K
Kristian Høgsberg 已提交
718

719
	if (!prepare_log_message(index_file, prefix) && !in_merge &&
J
Junio C Hamano 已提交
720
	    !allow_empty && !(amend && is_a_merge(head_sha1))) {
721
		run_status(stdout, index_file, prefix, 0);
722
		rollback_index_files();
K
Kristian Høgsberg 已提交
723 724 725 726
		unlink(commit_editmsg);
		return 1;
	}

727 728 729 730 731
	/*
	 * Re-read the index as pre-commit hook could have updated it,
	 * and write it out as a tree.
	 */
	discard_cache();
K
Kristian Høgsberg 已提交
732
	read_cache_from(index_file);
733 734
	if (!active_cache_tree)
		active_cache_tree = cache_tree();
K
Kristian Høgsberg 已提交
735
	if (cache_tree_update(active_cache_tree,
736 737
			      active_cache, active_nr, 0, 0) < 0) {
		rollback_index_files();
K
Kristian Høgsberg 已提交
738
		die("Error building trees");
739 740 741 742 743 744
	}

	/*
	 * The commit object
	 */
	strbuf_init(&sb, 0);
K
Kristian Høgsberg 已提交
745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783
	strbuf_addf(&sb, "tree %s\n",
		    sha1_to_hex(active_cache_tree->sha1));

	/* 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)
			strbuf_addf(&sb, "parent %s\n",
				      sha1_to_hex(c->item->object.sha1));
	} else if (in_merge) {
		struct strbuf m;
		FILE *fp;

		reflog_msg = "commit (merge)";
		strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
		strbuf_init(&m, 0);
		fp = fopen(git_path("MERGE_HEAD"), "r");
		if (fp == NULL)
			die("could not open %s for reading: %s",
			    git_path("MERGE_HEAD"), strerror(errno));
		while (strbuf_getline(&m, fp, '\n') != EOF)
			strbuf_addf(&sb, "parent %s\n", m.buf);
		fclose(fp);
		strbuf_release(&m);
	} else {
		reflog_msg = "commit";
		strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
	}

	determine_author_info(&sb);
784
	strbuf_addf(&sb, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
K
Kristian Høgsberg 已提交
785 786 787 788 789 790
	if (!is_encoding_utf8(git_commit_encoding))
		strbuf_addf(&sb, "encoding %s\n", git_commit_encoding);
	strbuf_addch(&sb, '\n');

	/* Get the commit message and validate it */
	header_len = sb.len;
791 792 793 794
	if (!no_edit) {
		char index[PATH_MAX];
		const char *env[2] = { index, NULL };
		snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
795
		launch_editor(git_path(commit_editmsg), NULL, env);
796
	}
797 798
	if (!no_verify &&
	    run_hook(index_file, "commit-msg", git_path(commit_editmsg))) {
799
		rollback_index_files();
K
Kristian Høgsberg 已提交
800
		exit(1);
801
	}
802 803 804 805
	if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
		rollback_index_files();
		die("could not read commit message");
	}
806 807 808 809

	/* Truncate the message just before the diff, if any. */
	p = strstr(sb.buf, "\ndiff --git a/");
	if (p != NULL)
810
		strbuf_setlen(&sb, p - sb.buf + 1);
811

K
Kristian Høgsberg 已提交
812
	stripspace(&sb, 1);
813 814
	if (sb.len < header_len || message_is_empty(&sb, header_len)) {
		rollback_index_files();
J
Jeff King 已提交
815
		die("no commit message?  aborting commit.");
816
	}
K
Kristian Høgsberg 已提交
817 818 819 820
	strbuf_addch(&sb, '\0');
	if (is_encoding_utf8(git_commit_encoding) && !is_utf8(sb.buf))
		fprintf(stderr, commit_utf8_warn);

821 822
	if (write_sha1_file(sb.buf, sb.len - 1, commit_type, commit_sha1)) {
		rollback_index_files();
K
Kristian Høgsberg 已提交
823
		die("failed to write commit object");
824
	}
K
Kristian Høgsberg 已提交
825 826 827 828 829 830

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

	nl = strchr(sb.buf + header_len, '\n');
831 832 833 834 835 836 837
	if (nl)
		strbuf_setlen(&sb, nl + 1 - sb.buf);
	else
		strbuf_addch(&sb, '\n');
	strbuf_remove(&sb, 0, header_len);
	strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
	strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
K
Kristian Høgsberg 已提交
838

839 840
	if (!ref_lock) {
		rollback_index_files();
K
Kristian Høgsberg 已提交
841
		die("cannot lock HEAD ref");
842 843 844
	}
	if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
		rollback_index_files();
K
Kristian Høgsberg 已提交
845
		die("cannot update HEAD ref");
846
	}
K
Kristian Høgsberg 已提交
847 848 849 850

	unlink(git_path("MERGE_HEAD"));
	unlink(git_path("MERGE_MSG"));

851
	commit_index_files();
K
Kristian Høgsberg 已提交
852 853

	rerere();
854
	run_hook(get_index_file(), "post-commit", NULL);
K
Kristian Høgsberg 已提交
855 856 857 858 859
	if (!quiet)
		print_summary(prefix, commit_sha1);

	return 0;
}