commit.c 36.6 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"
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 [email protected]\n"
"\n"
"If the identity used for this commit is wrong, you can fix it with:\n"
"\n"
"    git commit --amend --author='Your Name <[email protected]>'\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;
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 87
static const char *only_include_assumed;
static struct strbuf message;
88

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

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

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

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

	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"),
131
	OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
Kristian Høgsberg's avatar
Kristian Høgsberg committed
132
	OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
Junio C Hamano's avatar
Junio C Hamano committed
133
	OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
134 135 136 137 138 139
	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
140
	OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
141
	OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
142
	{ 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
143
	OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
144
	/* end commit contents options */
Kristian Høgsberg's avatar
Kristian Høgsberg committed
145 146 147 148

	OPT_END()
};

149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
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;
	}
}

164
static int commit_index_files(void)
165
{
166 167
	int err = 0;

168 169 170 171
	switch (commit_style) {
	case COMMIT_AS_IS:
		break; /* nothing to do */
	case COMMIT_NORMAL:
172
		err = commit_lock_file(&index_lock);
173 174
		break;
	case COMMIT_PARTIAL:
175
		err = commit_lock_file(&index_lock);
176 177 178
		rollback_lock_file(&false_lock);
		break;
	}
179 180

	return err;
181 182 183 184 185 186
}

/*
 * 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.
 */
187
static int list_paths(struct string_list *list, const char *with_tree,
188 189 190 191 192 193 194 195 196 197 198 199 200 201
		      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];
202 203
		struct string_list_item *item;

204
		if (ce->ce_flags & CE_UPDATE)
205
			continue;
206
		if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
207
			continue;
208 209 210
		item = string_list_insert(ce->name, list);
		if (ce_skip_worktree(ce))
			item->util = item; /* better a valid pointer than a fake one */
211 212 213 214 215
	}

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

216
static void add_remove_files(struct string_list *list)
217 218 219
{
	int i;
	for (i = 0; i < list->nr; i++) {
220
		struct stat st;
221
		struct string_list_item *p = &(list->items[i]);
222

223 224
		/* p->util is skip-worktree */
		if (p->util)
225
			continue;
226

227 228
		if (!lstat(p->string, &st)) {
			if (add_to_cache(p->string, &st, 0))
229 230
				die("updating files failed");
		} else
231
			remove_file_from_cache(p->string);
232 233 234
	}
}

235 236 237 238 239 240 241 242 243 244 245 246 247 248 249
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;
250 251
	opts.src_index = &the_index;
	opts.dst_index = &the_index;
252 253 254 255 256 257 258

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

263 264 265 266 267 268 269 270 271 272
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");
}

273
static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
274 275
{
	int fd;
276
	struct string_list partial;
277
	const char **pathspec = NULL;
278
	int refresh_flags = REFRESH_QUIET;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
279

280 281
	if (is_status)
		refresh_flags |= REFRESH_UNMERGED;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
282
	if (interactive) {
283 284
		if (interactive_add(argc, argv, prefix) != 0)
			die("interactive add failed");
Linus Torvalds's avatar
Linus Torvalds committed
285
		if (read_cache_preload(NULL) < 0)
286
			die("index file corrupt");
287
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
288 289 290
		return get_index_file();
	}

291 292
	if (*argv)
		pathspec = get_pathspec(prefix, argv);
293

Linus Torvalds's avatar
Linus Torvalds committed
294 295 296
	if (read_cache_preload(pathspec) < 0)
		die("index file corrupt");

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

320 321 322 323 324 325 326 327 328 329 330
	/*
	 * 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);
331
		refresh_cache_or_die(refresh_flags);
332
		if (write_cache(fd, active_cache, active_nr) ||
333
		    commit_locked_index(&index_lock))
334 335
			die("unable to write new_index file");
		commit_style = COMMIT_AS_IS;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
336 337 338
		return get_index_file();
	}

339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359
	/*
	 * 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;

360
	if (in_merge)
361 362 363
		die("cannot do a partial commit during a merge.");

	memset(&partial, 0, sizeof(partial));
364
	partial.strdup_strings = 1;
365 366 367 368 369 370 371 372 373
	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);
374
	refresh_cache(REFRESH_QUIET);
Brandon Casey's avatar
Brandon Casey committed
375 376
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&index_lock))
Kristian Høgsberg's avatar
Kristian Høgsberg committed
377 378
		die("unable to write new_index file");

379
	fd = hold_lock_file_for_update(&false_lock,
380 381
				       git_path("next-index-%"PRIuMAX,
						(uintmax_t) getpid()),
382
				       LOCK_DIE_ON_ERROR);
383 384

	create_base_index();
385
	add_remove_files(&partial);
386
	refresh_cache(REFRESH_QUIET);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
387

Brandon Casey's avatar
Brandon Casey committed
388 389
	if (write_cache(fd, active_cache, active_nr) ||
	    close_lock_file(&false_lock))
390
		die("unable to write temporary index file");
391 392 393 394

	discard_cache();
	read_cache_from(false_lock.filename);

395
	return false_lock.filename;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
396 397
}

398 399
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
400
{
401 402
	unsigned char sha1[20];

403 404
	if (s->relative_paths)
		s->prefix = prefix;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
405 406

	if (amend) {
407 408
		s->amend = 1;
		s->reference = "HEAD^1";
Kristian Høgsberg's avatar
Kristian Høgsberg committed
409
	}
410 411 412 413
	s->verbose = verbose;
	s->index_file = index_file;
	s->fp = fp;
	s->nowarn = nowarn;
414
	s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
415

416
	wt_status_collect(s);
417 418 419

	switch (status_format) {
	case STATUS_FORMAT_SHORT:
420
		wt_shortstatus_print(s, null_termination);
421 422
		break;
	case STATUS_FORMAT_PORCELAIN:
423
		wt_porcelain_print(s, null_termination);
424 425 426 427 428
		break;
	case STATUS_FORMAT_LONG:
		wt_status_print(s);
		break;
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
429

430
	return s->commitable;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
431 432
}

433 434 435 436 437 438 439 440
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
441 442
static const char sign_off_header[] = "Signed-off-by: ";

443
static void determine_author_info(void)
444 445 446 447 448 449 450
{
	char *name, *email, *date;

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

451
	if (use_message && !renew_authorship) {
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 478
		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));
	}

479 480 481
	if (force_date)
		date = force_date;

482 483 484
	author_name = name;
	author_email = email;
	author_date = date;
485 486
}

487 488 489 490 491 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
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;
}

528 529
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
530 531
{
	struct stat statbuf;
532
	int commitable, saved_color_setting;
533
	struct strbuf sb = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
534 535
	char *buffer;
	FILE *fp;
536 537
	const char *hook_arg1 = NULL;
	const char *hook_arg2 = NULL;
538
	int ident_shown = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
539

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

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

578 579 580 581 582 583 584
	/*
	 * 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
585 586
	fp = fopen(git_path(commit_editmsg), "w");
	if (fp == NULL)
587
		die_errno("could not open '%s'", git_path(commit_editmsg));
Kristian Høgsberg's avatar
Kristian Høgsberg committed
588

589 590
	if (cleanup_mode != CLEANUP_NONE)
		stripspace(&sb, 0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
591 592

	if (signoff) {
593
		struct strbuf sob = STRBUF_INIT;
594 595 596
		int i;

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

610
	if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
611
		die_errno("could not write commit template");
612

Kristian Høgsberg's avatar
Kristian Høgsberg committed
613 614
	strbuf_release(&sb);

615 616
	determine_author_info();

617 618
	/* This checks if committer ident is explicitly given */
	git_committer_info(0);
619
	if (use_editor && include_status) {
620 621 622
		char *author_ident;
		const char *committer_ident;

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

650 651 652 653 654
		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,
655 656 657
				"%s"
				"# Author:    %s\n",
				ident_shown++ ? "" : "#\n",
658 659 660
				author_ident);
		free(author_ident);

661
		if (!user_ident_sufficiently_given())
662 663 664 665 666 667 668 669 670
			fprintf(fp,
				"%s"
				"# Committer: %s\n",
				ident_shown++ ? "" : "#\n",
				committer_ident);

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

671 672 673 674
		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;
675
	} else {
676
		unsigned char sha1[20];
677
		const char *parent = "HEAD";
678 679 680 681

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

682 683 684
		if (amend)
			parent = "HEAD^1";

685
		if (get_sha1(parent, sha1))
686
			commitable = !!active_nr;
687 688
		else
			commitable = index_differs_from(parent, 0);
689
	}
690

691
	fclose(fp);
692

693 694
	if (!commitable && !in_merge && !allow_empty &&
	    !(amend && is_a_merge(head_sha1))) {
695
		run_status(stdout, index_file, prefix, 0, s);
696
		return 0;
697 698
	}

699 700 701 702 703 704 705 706 707 708 709
	/*
	 * 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) {
710
		error("Error building trees");
711
		return 0;
712
	}
Kristian Høgsberg's avatar
Kristian Høgsberg committed
713

714 715 716
	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
717

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

729 730 731 732
	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
733

734
	return 1;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
735 736 737
}

/*
738 739
 * 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
740
 */
741
static int message_is_empty(struct strbuf *sb)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
742
{
743
	struct strbuf tmpl = STRBUF_INIT;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
744
	const char *nl;
745
	int eol, i, start = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
746

747 748 749
	if (cleanup_mode == CLEANUP_NONE && sb->len)
		return 0;

Kristian Høgsberg's avatar
Kristian Høgsberg committed
750 751
	/* See if the template is just a prefix of the message. */
	if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
752
		stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
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
		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;
}

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

807 808 809 810 811 812 813 814 815 816 817 818 819 820 821

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

822
static int parse_and_validate_options(int argc, const char *argv[],
823
				      const char * const usage[],
824 825
				      const char *prefix,
				      struct wt_status *s)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
826 827 828
{
	int f = 0;

829 830
	argc = parse_options(argc, argv, prefix, builtin_commit_options, usage,
			     0);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
831

832 833 834
	if (force_author && !strchr(force_author, '>'))
		force_author = find_author_by_nickname(force_author);

835 836 837
	if (force_author && renew_authorship)
		die("Using both --reset-author and --author does not make sense");

838
	if (logfile || message.len || use_message)
839
		use_editor = 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
840
	if (edit_flag)
841
		use_editor = 1;
842 843
	if (!use_editor)
		setenv("GIT_EDITOR", ":", 1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
844 845 846 847 848 849 850 851

	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)
852
		die("You are in the middle of a merge -- cannot amend.");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
853 854 855 856 857 858 859 860 861

	if (use_message)
		f++;
	if (edit_message)
		f++;
	if (logfile)
		f++;
	if (f > 1)
		die("Only one of -c/-C/-F can be used.");
862
	if (message.len && f > 0)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
863 864 865
		die("Option -m cannot be combined with -c/-C/-F.");
	if (edit_message)
		use_message = edit_message;
866
	if (amend && !use_message)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
867
		use_message = "HEAD";
868 869
	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
870 871 872 873 874 875 876 877 878
	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
879
		commit = lookup_commit_reference(sha1);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
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
		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.";
914
	if (argc > 0 && !also && !only)
Kristian Høgsberg's avatar
Kristian Høgsberg committed
915
		only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
916 917 918 919 920 921 922 923 924 925
	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
926

927
	handle_untracked_files_arg(s);
928

Kristian Høgsberg's avatar
Kristian Høgsberg committed
929 930 931 932 933
	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.");

934 935 936 937 938
	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
939 940 941
	return argc;
}

942 943
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
944 945
{
	int commitable;
Junio C Hamano's avatar
Junio C Hamano committed
946
	const char *index_file;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
947

Junio C Hamano's avatar
Junio C Hamano committed
948
	index_file = prepare_index(argc, argv, prefix, 1);
949
	commitable = run_status(stdout, index_file, prefix, 0, s);
Junio C Hamano's avatar
Junio C Hamano committed
950
	rollback_index_files();
Kristian Høgsberg's avatar
Kristian Høgsberg committed
951

Junio C Hamano's avatar
Junio C Hamano committed
952 953 954
	return commitable ? 0 : 1;
}

955 956 957 958 959 960 961 962 963 964 965 966 967 968 969
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;
970
	return -1;
971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989
}

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

1037
	if (null_termination && status_format == STATUS_FORMAT_LONG)
1038
		status_format = STATUS_FORMAT_PORCELAIN;
1039 1040 1041

	wt_status_prepare(&s);
	git_config(git_status_config, &s);
1042
	in_merge = file_exists(git_path("MERGE_HEAD"));
1043
	argc = parse_options(argc, argv, prefix,
1044 1045
			     builtin_status_options,
			     builtin_status_usage, 0);
1046 1047 1048 1049 1050
	handle_untracked_files_arg(&s);

	if (*argv)
		s.pathspec = get_pathspec(prefix, argv);

1051
	read_cache_preload(s.pathspec);
1052
	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
1053
	s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
1054
	s.in_merge = in_merge;
1055 1056
	wt_status_collect(&s);

1057 1058
	if (s.relative_paths)
		s.prefix = prefix;
1059 1060
	if (s.use_color == -1)
		s.use_color = git_use_color_default;
1061 1062 1063
	if (diff_use_color_default == -1)
		diff_use_color_default = git_use_color_default;

1064 1065
	switch (status_format) {
	case STATUS_FORMAT_SHORT:
1066
		wt_shortstatus_print(&s, null_termination);
1067
		break;
1068
	case STATUS_FORMAT_PORCELAIN:
1069
		wt_porcelain_print(&s, null_termination);
1070
		break;
1071
	case STATUS_FORMAT_LONG:
1072 1073
		s.verbose = verbose;
		wt_status_print(&s);
1074
		break;
1075
	}
1076
	return 0;
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1077 1078 1079 1080 1081 1082
}

static void print_summary(const char *prefix, const unsigned char *sha1)
{
	struct rev_info rev;
	struct commit *commit;
1083
	struct strbuf format = STRBUF_INIT;
1084 1085
	unsigned char junk_sha1[20];
	const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
1086 1087 1088
	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
1089 1090 1091

	commit = lookup_commit(sha1);
	if (!commit)
1092
		die("couldn't look up newly created commit");
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1093 1094 1095
	if (!commit || parse_commit(commit))
		die("could not parse newly created commit");

1096 1097 1098 1099 1100 1101 1102 1103
	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);
	}
1104
	if (!user_ident_sufficiently_given()) {
1105 1106
		strbuf_addstr(&format, "\n Committer: ");
		strbuf_addbuf_percentquote(&format, &committer_ident);
1107 1108 1109 1110
		if (advice_implicit_identity) {
			strbuf_addch(&format, '\n');
			strbuf_addstr(&format, implicit_ident_advice);
		}
1111 1112 1113 1114
	}
	strbuf_release(&author_ident);
	strbuf_release(&committer_ident);

Kristian Høgsberg's avatar
Kristian Høgsberg committed
1115 1116 1117 1118 1119 1120 1121 1122 1123 1124
	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;
1125
	get_commit_format(format.buf, &rev);
1126
	rev.always_show_header = 0;
1127 1128 1129
	rev.diffopt.detect_rename = 1;
	rev.diffopt.rename_limit = 100;
	rev.diffopt.break_opt = 0;
1130
	diff_setup_done(&rev.diffopt);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1131

1132
	printf("[%s%s ",
1133 1134 1135 1136 1137 1138
		!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
1139

1140
	if (!log_tree_commit(&rev, commit)) {
1141
		struct pretty_print_context ctx = {0};
1142
		struct strbuf buf = STRBUF_INIT;
1143
		ctx.date_mode = DATE_NORMAL;
1144
		format_commit_message(commit, format.buf + 7, &buf, &ctx);
1145 1146 1147
		printf("%s\n", buf.buf);
		strbuf_release(&buf);
	}
1148
	strbuf_release(&format);
Kristian Høgsberg's avatar
Kristian Høgsberg committed
1149 1150
}

1151
static int git_commit_config(const char *k, const