commit.c 37.2 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 <krh@redhat.com>
 * 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"
27
#include "quote.h"
Kristian Høgsberg's avatar
Kristian Høgsberg committed
28 29

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

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

39 40 41 42 43
static const char implicit_ident_advice[] =
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
44
"    git config --global user.name \"Your Name\"\n"
45 46 47 48 49 50
"    git config --global user.email you@example.com\n"
"\n"
"If the identity used for this commit is wrong, you can fix it with:\n"
"\n"
"    git commit --amend --author='Your Name <you@example.com>'\n";

51
static unsigned char head_sha1[20];
52

Kristian Høgsberg's avatar
Kristian Høgsberg committed
53 54
static char *use_message_buffer;
static const char commit_editmsg[] = "COMMIT_EDITMSG";
55 56 57 58 59 60 61
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
62

63
static const char *logfile, *force_author;
64
static const char *template_file;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
65
static char *edit_message, *use_message;
66
static char *author_name, *author_email, *author_date;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
67
static int all, edit_flag, also, interactive, only, amend, signoff;
68
static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
69
static int no_post_rewrite, allow_empty_message;
70
static char *untracked_files_arg, *force_date;
71 72 73 74 75 76 77 78 79 80 81 82 83
/*
 * 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
84

85
static int use_editor = 1, initial_commit, in_merge, include_status = 1;
86
static int show_ignored_in_status;
87 88
static const char *only_include_assumed;
static struct strbuf message;
89

90 91 92 93 94 95 96
static int null_termination;
static enum {
	STATUS_FORMAT_LONG,
	STATUS_FORMAT_SHORT,
	STATUS_FORMAT_PORCELAIN,
} status_format = STATUS_FORMAT_LONG;

97 98 99 100 101 102 103
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);
104
		strbuf_addstr(buf, "\n\n");
105 106 107
	}
	return 0;
}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
108 109 110 111 112

static struct option builtin_commit_options[] = {
	OPT__QUIET(&quiet),
	OPT__VERBOSE(&verbose),

113
	OPT_GROUP("Commit message options"),
114
	OPT_FILENAME('F', "file", &logfile, "read log from file"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
115
	OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
116
	OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
117
	OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
118
	OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
119
	OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
120
	OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
121
	OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
122
	OPT_FILENAME('t', "template", &template_file, "use specified template file"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
123
	OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
124
	OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
125
	OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
126
	/* end commit message options */
Kristian Høgsberg's avatar
Kristian Høgsberg committed
127 128 129 130 131

	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"),
132
	OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
133
	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
Junio C Hamano's avatar
Junio C Hamano committed
134
	OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
135 136 137 138 139 140
	OPT_SET_INT(0, "short", &status_format, "show status concisely",
		    STATUS_FORMAT_SHORT),
	OPT_SET_INT(0, "porcelain", &status_format,
		    "show porcelain output format", STATUS_FORMAT_PORCELAIN),
	OPT_BOOLEAN('z', "null", &null_termination,
		    "terminate entries with NUL"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
141
	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
142
	OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
143
	{ 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" },
144
	/* end commit contents options */
Kristian Høgsberg's avatar
Kristian Høgsberg committed
145

146 147 148 149 150 151 152
	{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
	  "ok to record an empty change",
	  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
	{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
	  "ok to record a change with an empty message",
	  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },

Kristian Høgsberg's avatar
Kristian Høgsberg committed
153 154 155
	OPT_END()
};

156 157 158 159 160 161 162 163 164 165 166 167 168 169 170
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;
	}
}

171
static int commit_index_files(void)
172
{
173 174
	int err = 0;

175 176 177 178
	switch (commit_style) {
	case COMMIT_AS_IS:
		break; /* nothing to do */
	case COMMIT_NORMAL:
179
		err = commit_lock_file(&index_lock);
180 181
		break;
	case COMMIT_PARTIAL:
182
		err = commit_lock_file(&index_lock);
183 184 185
		rollback_lock_file(&false_lock);
		break;
	}
186 187

	return err;
188 189 190 191 192 193
}

/*
 * 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.
 */
194
static int list_paths(struct string_list *list, const char *with_tree,
195 196 197 198 199 200 201 202 203 204 205 206 207 208
		      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];
209 210
		struct string_list_item *item;

211
		if (ce->ce_flags & CE_UPDATE)
212
			continue;
213
		if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
214
			continue;
215 216 217
		item = string_list_insert(ce->name, list);
		if (ce_skip_worktree(ce))
			item->util = item; /* better a valid pointer than a fake one */
218 219 220 221 222
	}

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

223
static void add_remove_files(struct string_list *list)
224 225 226
{
	int i;
	for (i = 0; i < list->nr; i++) {
227
		struct stat st;
228
		struct string_list_item *p = &(list->items[i]);
229

230 231
		/* p->util is skip-worktree */
		if (p->util)
232
			continue;
233

234 235
		if (!lstat(p->string, &st)) {
			if (add_to_cache(p->string, &st, 0))
236 237
				die("updating files failed");
		} else
238
			remove_file_from_cache(p->string);
239 240 241
	}
}

242 243 244 245 246 247 248 249 250 251 252 253 254 255 256
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;
257 258
	opts.src_index = &the_index;
	opts.dst_index = &the_index;
259 260 261 262 263 264 265

	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);
266 267
	if (unpack_trees(1, &t, &opts))
		exit(128); /* We've already reported the error, finish dying */
268 269
}

270 271 272 273 274 275 276 277 278 279
static void refresh_cache_or_die(int refresh_flags)
{
	/*
	 * refresh_flags contains REFRESH_QUIET, so the only errors
	 * are for unmerged entries.
	 */
	if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))
		die_resolve_conflict("commit");
}

280
static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
281 282
{
	int fd;
283
	struct string_list partial;
284
	const char **pathspec = NULL;
285
	int refresh_flags = REFRESH_QUIET;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
286

287 288
	if (is_status)
		refresh_flags |= REFRESH_UNMERGED;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
289
	if (interactive) {
290 291
		if (interactive_add(argc, argv, prefix) != 0)
			die("interactive add failed");
Linus Torvalds's avatar
Linus Torvalds committed
292
		if (read_cache_preload(NULL) < 0)
293
			die("index file corrupt");
294
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
295 296 297
		return get_index_file();
	}

298 299
	if (*argv)
		pathspec = get_pathspec(prefix, argv);
300

Linus Torvalds's avatar
Linus Torvalds committed
301 302 303
	if (read_cache_preload(pathspec) < 0)
		die("index file corrupt");

304 305 306 307 308 309 310 311 312 313 314 315 316
	/*
	 * 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)) {
317
		fd = hold_locked_index(&index_lock, 1);
318
		add_files_to_cache(also ? prefix : NULL, pathspec, 0);
319
		refresh_cache_or_die(refresh_flags);
Brandon Casey's avatar
Brandon Casey committed
320 321
		if (write_cache(fd, active_cache, active_nr) ||
		    close_lock_file(&index_lock))
Kristian Høgsberg's avatar
Kristian Høgsberg committed
322
			die("unable to write new_index file");
323 324
		commit_style = COMMIT_NORMAL;
		return index_lock.filename;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
325 326
	}

327 328 329 330 331
	/*
	 * As-is commit.
	 *
	 * (1) return the name of the real index file.
	 *
332 333
	 * The caller should run hooks on the real index,
	 * and create commit from the_index.
334 335 336 337
	 * We still need to refresh the index here.
	 */
	if (!pathspec || !*pathspec) {
		fd = hold_locked_index(&index_lock, 1);
338
		refresh_cache_or_die(refresh_flags);
339
		if (write_cache(fd, active_cache, active_nr) ||
340
		    commit_locked_index(&index_lock))
341 342
			die("unable to write new_index file");
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
343 344 345
		return get_index_file();
	}

346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366
	/*
	 * 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;

367
	if (in_merge)
368 369 370
		die("cannot do a partial commit during a merge.");

	memset(&partial, 0, sizeof(partial));
371
	partial.strdup_strings = 1;
372 373 374 375 376 377 378 379 380
	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);
381
	refresh_cache(REFRESH_QUIET);
Brandon Casey's avatar
Brandon Casey committed
382 383
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&index_lock))
Kristian Høgsberg's avatar
Kristian Høgsberg committed
384 385
		die("unable to write new_index file");

386
	fd = hold_lock_file_for_update(&false_lock,
387 388
				       git_path("next-index-%"PRIuMAX,
						(uintmax_t) getpid()),
389
				       LOCK_DIE_ON_ERROR);
390 391

	create_base_index();
392
	add_remove_files(&partial);
393
	refresh_cache(REFRESH_QUIET);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
394

Brandon Casey's avatar
Brandon Casey committed
395 396
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&false_lock))
397
		die("unable to write temporary index file");
398 399 400 401

	discard_cache();
	read_cache_from(false_lock.filename);

402
	return false_lock.filename;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
403 404
}

405 406
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
407
{
408 409
	unsigned char sha1[20];

410 411
	if (s->relative_paths)
		s->prefix = prefix;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
412 413

	if (amend) {
414 415
		s->amend = 1;
		s->reference = "HEAD^1";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
416
	}
417 418 419 420
	s->verbose = verbose;
	s->index_file = index_file;
	s->fp = fp;
	s->nowarn = nowarn;
421
	s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
422

423
	wt_status_collect(s);
424 425 426

	switch (status_format) {
	case STATUS_FORMAT_SHORT:
427
		wt_shortstatus_print(s, null_termination);
428 429
		break;
	case STATUS_FORMAT_PORCELAIN:
430
		wt_porcelain_print(s, null_termination);
431 432 433 434 435
		break;
	case STATUS_FORMAT_LONG:
		wt_status_print(s);
		break;
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
436

437
	return s->commitable;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
438 439
}

440 441 442 443 444 445 446 447
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
448 449
static const char sign_off_header[] = "Signed-off-by: ";

450
static void determine_author_info(void)
451 452 453 454 455 456 457
{
	char *name, *email, *date;

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

458
	if (use_message && !renew_authorship) {
459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485
		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));
	}

486 487 488
	if (force_date)
		date = force_date;

489 490 491
	author_name = name;
	author_email = email;
	author_date = date;
492 493
}

494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534
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;
}

535 536
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
537 538
{
	struct stat statbuf;
539
	int commitable, saved_color_setting;
540
	struct strbuf sb = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
541 542
	char *buffer;
	FILE *fp;
543 544
	const char *hook_arg1 = NULL;
	const char *hook_arg2 = NULL;
545
	int ident_shown = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
546

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

550 551
	if (message.len) {
		strbuf_addbuf(&sb, &message);
552
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
553 554 555 556
	} else if (logfile && !strcmp(logfile, "-")) {
		if (isatty(0))
			fprintf(stderr, "(reading log message from standard input)\n");
		if (strbuf_read(&sb, 0, 0) < 0)
557
			die_errno("could not read log from standard input");
558
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
559 560
	} else if (logfile) {
		if (strbuf_read_file(&sb, logfile, 0) < 0)
561 562
			die_errno("could not read log file '%s'",
				  logfile);
563
		hook_arg1 = "message";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
564 565 566 567 568
	} 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));
569 570
		hook_arg1 = "commit";
		hook_arg2 = use_message;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
571 572
	} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
573
			die_errno("could not read MERGE_MSG");
574
		hook_arg1 = "merge";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
575 576
	} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
		if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
577
			die_errno("could not read SQUASH_MSG");
578
		hook_arg1 = "squash";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
579 580
	} else if (template_file && !stat(template_file, &statbuf)) {
		if (strbuf_read_file(&sb, template_file, 0) < 0)
581
			die_errno("could not read '%s'", template_file);
582
		hook_arg1 = "template";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
583 584
	}

585 586 587 588 589 590 591
	/*
	 * 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
592 593
	fp = fopen(git_path(commit_editmsg), "w");
	if (fp == NULL)
594
		die_errno("could not open '%s'", git_path(commit_editmsg));
Kristian Høgsberg's avatar
Kristian Høgsberg committed
595

596 597
	if (cleanup_mode != CLEANUP_NONE)
		stripspace(&sb, 0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
598 599

	if (signoff) {
600
		struct strbuf sob = STRBUF_INIT;
601 602 603
		int i;

		strbuf_addstr(&sob, sign_off_header);
604 605
		strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
					     getenv("GIT_COMMITTER_EMAIL")));
606 607 608
		strbuf_addch(&sob, '\n');
		for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
			; /* do nothing */
609
		if (prefixcmp(sb.buf + i, sob.buf)) {
610
			if (!i || !ends_rfc2822_footer(&sb))
611
				strbuf_addch(&sb, '\n');
612
			strbuf_addbuf(&sb, &sob);
613
		}
614
		strbuf_release(&sob);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
615 616
	}

617
	if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
618
		die_errno("could not write commit template");
619

Kristian Høgsberg's avatar
Kristian Høgsberg committed
620 621
	strbuf_release(&sb);

622 623
	determine_author_info();

624 625
	/* This checks if committer ident is explicitly given */
	git_committer_info(0);
626
	if (use_editor && include_status) {
627 628 629
		char *author_ident;
		const char *committer_ident;

630 631 632 633 634 635 636 637 638 639 640 641
		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
642
			"# Please enter the commit message for your changes.");
643
		if (cleanup_mode == CLEANUP_ALL)
Jeff King's avatar
Jeff King committed
644 645 646 647
			fprintf(fp,
				" Lines starting\n"
				"# with '#' will be ignored, and an empty"
				" message aborts the commit.\n");
648
		else /* CLEANUP_SPACE, that is. */
Jeff King's avatar
Jeff King committed
649 650 651 652 653
			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");
654 655 656
		if (only_include_assumed)
			fprintf(fp, "# %s\n", only_include_assumed);

657 658 659 660 661
		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,
662 663 664
				"%s"
				"# Author:    %s\n",
				ident_shown++ ? "" : "#\n",
665 666 667
				author_ident);
		free(author_ident);

668
		if (!user_ident_sufficiently_given())
669 670 671 672 673 674 675 676 677
			fprintf(fp,
				"%s"
				"# Committer: %s\n",
				ident_shown++ ? "" : "#\n",
				committer_ident);

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

678 679 680 681
		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;
682
	} else {
683
		unsigned char sha1[20];
684
		const char *parent = "HEAD";
685 686 687 688

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

689 690 691
		if (amend)
			parent = "HEAD^1";

692
		if (get_sha1(parent, sha1))
693
			commitable = !!active_nr;
694 695
		else
			commitable = index_differs_from(parent, 0);
696
	}
697

698
	fclose(fp);
699

700 701
	if (!commitable && !in_merge && !allow_empty &&
	    !(amend && is_a_merge(head_sha1))) {
702
		run_status(stdout, index_file, prefix, 0, s);
703
		return 0;
704 705
	}

706 707 708 709 710 711 712 713 714 715 716
	/*
	 * 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) {
717
		error("Error building trees");
718
		return 0;
719
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
720

721 722 723
	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
724

725 726 727 728
	if (use_editor) {
		char index[PATH_MAX];
		const char *env[2] = { index, NULL };
		snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
729 730 731 732 733
		if (launch_editor(git_path(commit_editmsg), NULL, env)) {
			fprintf(stderr,
			"Please supply the message using either -m or -F option.\n");
			exit(1);
		}
734
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
735

736 737 738 739
	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
740

741
	return 1;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
742 743 744
}

/*
745 746
 * 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
747
 */
748
static int message_is_empty(struct strbuf *sb)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
749
{
750
	struct strbuf tmpl = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
751
	const char *nl;
752
	int eol, i, start = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
753

754 755 756
	if (cleanup_mode == CLEANUP_NONE && sb->len)
		return 0;

Kristian Høgsberg's avatar
Kristian Høgsberg committed
757 758
	/* See if the template is just a prefix of the message. */
	if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
759
		stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786
		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;
}

787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804
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) {
805 806
		struct pretty_print_context ctx = {0};
		ctx.date_mode = DATE_NORMAL;
807
		strbuf_release(&buf);
808
		format_commit_message(commit, "%an <%ae>", &buf, &ctx);
809 810 811 812 813
		return strbuf_detach(&buf, NULL);
	}
	die("No existing author found with '%s'", name);
}

814 815 816 817 818 819 820 821 822 823 824 825 826 827 828

static void handle_untracked_files_arg(struct wt_status *s)
{
	if (!untracked_files_arg)
		; /* default already initialized */
	else if (!strcmp(untracked_files_arg, "no"))
		s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
	else if (!strcmp(untracked_files_arg, "normal"))
		s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
	else if (!strcmp(untracked_files_arg, "all"))
		s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
	else
		die("Invalid untracked files mode '%s'", untracked_files_arg);
}

829
static int parse_and_validate_options(int argc, const char *argv[],
830
				      const char * const usage[],
831 832
				      const char *prefix,
				      struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
833 834 835
{
	int f = 0;

836 837
	argc = parse_options(argc, argv, prefix, builtin_commit_options, usage,
			     0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
838

839 840 841
	if (force_author && !strchr(force_author, '>'))
		force_author = find_author_by_nickname(force_author);

842 843 844
	if (force_author && renew_authorship)
		die("Using both --reset-author and --author does not make sense");

845
	if (logfile || message.len || use_message)
846
		use_editor = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
847
	if (edit_flag)
848
		use_editor = 1;
849 850
	if (!use_editor)
		setenv("GIT_EDITOR", ":", 1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
851 852 853 854 855 856 857 858

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

	/* Sanity check options */
	if (amend && initial_commit)
		die("You have nothing to amend.");
	if (amend && in_merge)
859
		die("You are in the middle of a merge -- cannot amend.");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
860 861 862 863 864 865 866 867 868

	if (use_message)
		f++;
	if (edit_message)
		f++;
	if (logfile)
		f++;
	if (f > 1)
		die("Only one of -c/-C/-F can be used.");
869
	if (message.len && f > 0)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
870 871 872
		die("Option -m cannot be combined with -c/-C/-F.");
	if (edit_message)
		use_message = edit_message;
873
	if (amend && !use_message)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
874
		use_message = "HEAD";
875 876
	if (!use_message && renew_authorship)
		die("--reset-author can be used only with -C, -c or --amend.");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
877 878 879 880 881 882 883 884 885
	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
886
		commit = lookup_commit_reference(sha1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
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
		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.";
921
	if (argc > 0 && !also && !only)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
922
		only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
923 924 925 926 927 928 929 930 931 932
	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
933

934
	handle_untracked_files_arg(s);
935

Kristian Høgsberg's avatar
Kristian Høgsberg committed
936 937 938 939 940
	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.");

941 942 943 944 945
	if (null_termination && status_format == STATUS_FORMAT_LONG)
		status_format = STATUS_FORMAT_PORCELAIN;
	if (status_format != STATUS_FORMAT_LONG)
		dry_run = 1;

Kristian Høgsberg's avatar
Kristian Høgsberg committed
946 947 948
	return argc;
}

949 950
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
951 952
{
	int commitable;
Junio C Hamano's avatar
Junio C Hamano committed
953
	const char *index_file;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
954

Junio C Hamano's avatar
Junio C Hamano committed
955
	index_file = prepare_index(argc, argv, prefix, 1);
956
	commitable = run_status(stdout, index_file, prefix, 0, s);
Junio C Hamano's avatar
Junio C Hamano committed
957
	rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
958

Junio C Hamano's avatar
Junio C Hamano committed
959 960 961
	return commitable ? 0 : 1;
}

962 963 964 965 966 967 968 969 970 971 972 973 974 975 976
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;
977
	return -1;
978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996
}

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);
997 998
		if (slot < 0)
			return 0;
999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
		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
1024 1025
int cmd_status(int argc, const char **argv, const char *prefix)
{
1026
	struct wt_status s;
1027
	int fd;
1028
	unsigned char sha1[20];
1029
	static struct option builtin_status_options[] = {
1030
		OPT__VERBOSE(&verbose),
1031 1032
		OPT_SET_INT('s', "short", &status_format,
			    "show status concisely", STATUS_FORMAT_SHORT),
1033 1034 1035
		OPT_SET_INT(0, "porcelain", &status_format,
			    "show porcelain output format",
			    STATUS_FORMAT_PORCELAIN),
1036 1037
		OPT_BOOLEAN('z', "null", &null_termination,
			    "terminate entries with NUL"),
1038 1039 1040 1041
		{ 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" },
1042 1043
		OPT_BOOLEAN(0, "ignored", &show_ignored_in_status,
			    "show ignored files"),
1044 1045 1046
		OPT_END(),
	};

1047
	if (null_termination && status_format == STATUS_FORMAT_LONG)
1048
		status_format = STATUS_FORMAT_PORCELAIN;
1049 1050 1051

	wt_status_prepare(&s);
	git_config(git_status_config, &s);
1052
	in_merge = file_exists(git_path("MERGE_HEAD"));
1053
	argc = parse_options(argc, argv, prefix,
1054 1055
			     builtin_status_options,
			     builtin_status_usage, 0);
1056
	handle_untracked_files_arg(&s);
1057 1058
	if (show_ignored_in_status)
		s.show_ignored_files = 1;
1059 1060 1061
	if (*argv)
		s.pathspec = get_pathspec(prefix, argv);

1062
	read_cache_preload(s.pathspec);
1063
	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
1064 1065 1066 1067 1068 1069 1070 1071

	fd = hold_locked_index(&index_lock, 0);
	if (0 <= fd) {
		if (!write_cache(fd, active_cache, active_nr))
			commit_locked_index(&index_lock);
		rollback_lock_file(&index_lock);
	}

1072
	s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
1073
	s.in_merge = in_merge;
1074 1075
	wt_status_collect(&s);

1076 1077
	if (s.relative_paths)
		s.prefix = prefix;
1078 1079
	if (s.use_color == -1)
		s.use_color = git_use_color_default;
1080 1081 1082
	if (diff_use_color_default == -1)
		diff_use_color_default = git_use_color_default;

1083 1084
	switch (status_format) {
	case STATUS_FORMAT_SHORT:
1085
		wt_shortstatus_print(&s, null_termination);
1086
		break;
1087
	case STATUS_FORMAT_PORCELAIN:
1088
		wt_porcelain_print(&s, null_termination);
1089
		break;
1090
	case STATUS_FORMAT_LONG:
1091 1092
		s.verbose = verbose;
		wt_status_print(&s);
1093
		break;
1094
	}
1095
	return 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1096 1097 1098 1099 1100 1101
}

static void print_summary(const char *prefix, const unsigned char *sha1)
{
	struct rev_info rev;
	struct commit *commit;
1102
	struct strbuf format = STRBUF_INIT;
1103 1104
	unsigned char junk_sha1[20];
	const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
1105 1106 1107
	struct pretty_print_context pctx = {0};
	struct strbuf author_ident = STRBUF_INIT;
	struct strbuf committer_ident = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1108 1109 1110

	commit = lookup_commit(sha1);
	if (!commit)
1111
		die("couldn't look up newly created commit");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1112 1113 1114
	if (!commit || parse_commit(commit))
		die("could not parse newly created commit");

1115 1116 1117 1118 1119 1120 1121 1122
	strbuf_addstr(&format, "format:%h] %s");

	format_commit_message(commit, "%an <%ae>", &author_ident, &pctx);
	format_commit_message(commit, "%cn <%ce>", &committer_ident, &pctx);
	if (strbuf_cmp(&author_ident, &committer_ident)) {
		strbuf_addstr(&format, "\n Author: ");
		strbuf_addbuf_percentquote(&format, &author_ident);
	}
1123
	if (!user_ident_sufficiently_given()) {
1124 1125
		strbuf_addstr(&format, "\n Committer: ");
		strbuf_addbuf_percentquote(&format, &committer_ident);
1126 1127 1128 1129
		if (advice_implicit_identity) {
			strbuf_addch(&format, '\n');
			strbuf_addstr(&format, implicit_ident_advice);
		}
1130 1131 1132 1133
	}
	strbuf_release(&author_ident);
	strbuf_release(&committer_ident);

Kristian Høgsberg's avatar
Kristian Høgsberg committed
1134 1135 1136 1137 1138 1139 1140 1141 1142 1143
	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;
1144
	get_commit_format(format.buf, &rev);
1145
	rev.always_show_header = 0;
1146 1147 1148
	rev.diffopt.detect_rename = 1;
	rev.diffopt.rename_limit = 100;
	rev.diffopt.break_opt = 0;
1149
	diff_setup_done(&rev.diffopt);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1150

1151
	printf("[%s%s ",
1152 1153 1154 1155 1156 1157
		!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
1158

1159
	if (!log_tree_commit(&rev, commit)) {
1160
		struct pretty_print_context ctx = {0};
1161
		struct strbuf buf = STRBUF_INIT;
1162
		ctx.date_mode = DATE_NORMAL;
1163
		format_commit_message(commit, format.buf + 7, &buf, &ctx);
1164 1165 1166
		printf("%s\n", buf.buf);
		strbuf_release(&buf);
	}
1167
	strbuf_release(&format);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1168 1169
}

1170
static int git_commit_config(const char *k, const char *v, void *cb)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1171
{
1172 1173
	struct wt_status *s = cb;