From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:53 +0000 (+0900)
Subject: Merge branch 'bw/commit-partial-from-subdirectory-fix'
X-Git-Tag: v2.18.0-rc0~127
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8295f2028f622da2da2b9e31a2793be64ce45a07?hp=-c

Merge branch 'bw/commit-partial-from-subdirectory-fix'

"cd sub/dir && git commit ../path" ought to record the changes to
the file "sub/path", but this regressed long time ago.

* bw/commit-partial-from-subdirectory-fix:
commit: allow partial commits with relative paths
---

8295f2028f622da2da2b9e31a2793be64ce45a07
diff --combined builtin/commit.c
index 37fcb55ab0,12a0995b36..5571d4a3e2
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -31,7 -31,9 +31,7 @@@
  #include "gpg-interface.h"
  #include "column.h"
  #include "sequencer.h"
 -#include "notes-utils.h"
  #include "mailmap.h"
 -#include "sigchain.h"
  
  static const char * const builtin_commit_usage[] = {
  	N_("git commit [<options>] [--] <pathspec>..."),
@@@ -43,6 -45,31 +43,6 @@@ static const char * const builtin_statu
  	NULL
  };
  
 -static const char implicit_ident_advice_noconfig[] =
 -N_("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. Run the\n"
 -"following command and follow the instructions in your editor to edit\n"
 -"your configuration file:\n"
 -"\n"
 -"    git config --global --edit\n"
 -"\n"
 -"After doing this, you may fix the identity used for this commit with:\n"
 -"\n"
 -"    git commit --amend --reset-author\n");
 -
 -static const char implicit_ident_advice_config[] =
 -N_("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"
 -"    git config --global user.name \"Your Name\"\n"
 -"    git config --global user.email you@example.com\n"
 -"\n"
 -"After doing this, you may fix the identity used for this commit with:\n"
 -"\n"
 -"    git commit --amend --reset-author\n");
 -
  static const char empty_amend_advice[] =
  N_("You asked to amend the most recent commit, but doing so would make\n"
  "it empty. You can repeat your command with --allow-empty, or you can\n"
@@@ -66,6 -93,8 +66,6 @@@ N_("If you wish to skip this commit, us
  "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
  "the remaining commits.\n");
  
 -static GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG")
 -
  static const char *use_message_buffer;
  static struct lock_file index_lock; /* real index */
  static struct lock_file false_lock; /* used only for partial commits */
@@@ -89,7 -118,7 +89,7 @@@ static int edit_flag = -1; /* unspecifi
  static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
  static int config_commit_verbose = -1; /* unspecified */
  static int no_post_rewrite, allow_empty_message;
 -static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
 +static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
  static char *sign_commit;
  
  /*
@@@ -99,13 -128,18 +99,13 @@@
   * if editor is used, and only the whitespaces if the message
   * is specified explicitly.
   */
 -static enum {
 -	CLEANUP_SPACE,
 -	CLEANUP_NONE,
 -	CLEANUP_SCISSORS,
 -	CLEANUP_ALL
 -} cleanup_mode;
 +static enum commit_msg_cleanup_mode cleanup_mode;
  static const char *cleanup_arg;
  
  static enum commit_whence whence;
  static int sequencer_in_use;
  static int use_editor = 1, include_status = 1;
 -static int show_ignored_in_status, have_option_m;
 +static int have_option_m;
  static struct strbuf message = STRBUF_INIT;
  
  static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
@@@ -161,6 -195,7 +161,6 @@@ static void determine_whence(struct wt_
  static void status_init_config(struct wt_status *s, config_fn_t fn)
  {
  	wt_status_prepare(s);
 -	gitmodules_config();
  	git_config(fn, s);
  	determine_whence(s);
  	init_diff_ui_defaults();
@@@ -218,8 -253,7 +218,7 @@@ static int list_paths(struct string_lis
  
  	if (with_tree) {
  		char *max_prefix = common_prefix(pattern);
- 		overlay_tree_on_index(&the_index, with_tree,
- 				      max_prefix ? max_prefix : prefix);
+ 		overlay_tree_on_index(&the_index, with_tree, max_prefix);
  		free(max_prefix);
  	}
  
@@@ -301,7 -335,7 +300,7 @@@ static void refresh_cache_or_die(int re
  static const char *prepare_index(int argc, const char **argv, const char *prefix,
  				 const struct commit *current_head, int is_status)
  {
 -	struct string_list partial;
 +	struct string_list partial = STRING_LIST_INIT_DUP;
  	struct pathspec pathspec;
  	int refresh_flags = REFRESH_QUIET;
  	const char *ret;
@@@ -321,7 -355,7 +320,7 @@@
  
  		refresh_cache_or_die(refresh_flags);
  
 -		if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
 +		if (write_locked_index(&the_index, &index_lock, 0))
  			die(_("unable to create temporary index"));
  
  		old_index_env = getenv(INDEX_ENVIRONMENT);
@@@ -340,14 -374,13 +339,14 @@@
  		if (update_main_cache_tree(WRITE_TREE_SILENT) == 0) {
  			if (reopen_lock_file(&index_lock) < 0)
  				die(_("unable to write index file"));
 -			if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
 +			if (write_locked_index(&the_index, &index_lock, 0))
  				die(_("unable to update temporary index"));
  		} else
  			warning(_("Failed to update main cache tree"));
  
  		commit_style = COMMIT_NORMAL;
 -		return get_lock_file_path(&index_lock);
 +		ret = get_lock_file_path(&index_lock);
 +		goto out;
  	}
  
  	/*
@@@ -367,11 -400,10 +366,11 @@@
  		add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
  		refresh_cache_or_die(refresh_flags);
  		update_main_cache_tree(WRITE_TREE_SILENT);
 -		if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
 +		if (write_locked_index(&the_index, &index_lock, 0))
  			die(_("unable to write new_index file"));
  		commit_style = COMMIT_NORMAL;
 -		return get_lock_file_path(&index_lock);
 +		ret = get_lock_file_path(&index_lock);
 +		goto out;
  	}
  
  	/*
@@@ -389,12 -421,15 +388,12 @@@
  		if (active_cache_changed
  		    || !cache_tree_fully_valid(active_cache_tree))
  			update_main_cache_tree(WRITE_TREE_SILENT);
 -		if (active_cache_changed) {
 -			if (write_locked_index(&the_index, &index_lock,
 -					       COMMIT_LOCK))
 -				die(_("unable to write new_index file"));
 -		} else {
 -			rollback_lock_file(&index_lock);
 -		}
 +		if (write_locked_index(&the_index, &index_lock,
 +				       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 +			die(_("unable to write new_index file"));
  		commit_style = COMMIT_AS_IS;
 -		return get_index_file();
 +		ret = get_index_file();
 +		goto out;
  	}
  
  	/*
@@@ -425,6 -460,7 +424,6 @@@
  			die(_("cannot do a partial commit during a cherry-pick."));
  	}
  
 -	string_list_init(&partial, 1);
  	if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
  		exit(1);
  
@@@ -436,7 -472,7 +435,7 @@@
  	add_remove_files(&partial);
  	refresh_cache(REFRESH_QUIET);
  	update_main_cache_tree(WRITE_TREE_SILENT);
 -	if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
 +	if (write_locked_index(&the_index, &index_lock, 0))
  		die(_("unable to write new_index file"));
  
  	hold_lock_file_for_update(&false_lock,
@@@ -448,15 -484,12 +447,15 @@@
  	add_remove_files(&partial);
  	refresh_cache(REFRESH_QUIET);
  
 -	if (write_locked_index(&the_index, &false_lock, CLOSE_LOCK))
 +	if (write_locked_index(&the_index, &false_lock, 0))
  		die(_("unable to write temporary index file"));
  
  	discard_cache();
  	ret = get_lock_file_path(&false_lock);
  	read_cache_from(ret);
 +out:
 +	string_list_clear(&partial, 0);
 +	clear_pathspec(&pathspec);
  	return ret;
  }
  
@@@ -476,7 -509,7 +475,7 @@@ static int run_status(FILE *fp, const c
  	s->index_file = index_file;
  	s->fp = fp;
  	s->nowarn = nowarn;
 -	s->is_initial = get_sha1(s->reference, oid.hash) ? 1 : 0;
 +	s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
  	if (!s->is_initial)
  		hashcpy(s->sha1_commit, oid.hash);
  	s->status_format = status_format;
@@@ -635,7 -668,7 +634,7 @@@ static int prepare_to_commit(const cha
  	struct strbuf sb = STRBUF_INIT;
  	const char *hook_arg1 = NULL;
  	const char *hook_arg2 = NULL;
 -	int clean_message_contents = (cleanup_mode != CLEANUP_NONE);
 +	int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
  	int old_display_comment_prefix;
  
  	/* This checks and barfs if author is badly specified */
@@@ -663,7 -696,7 +662,7 @@@
  		}
  	}
  
 -	if (have_option_m) {
 +	if (have_option_m && !fixup_message) {
  		strbuf_addbuf(&sb, &message);
  		hook_arg1 = "message";
  	} else if (logfile && !strcmp(logfile, "-")) {
@@@ -693,8 -726,6 +692,8 @@@
  		ctx.output_encoding = get_commit_output_encoding();
  		format_commit_message(commit, "fixup! %s\n\n",
  				      &sb, &ctx);
 +		if (have_option_m)
 +			strbuf_addbuf(&sb, &message);
  		hook_arg1 = "message";
  	} else if (!stat(git_path_merge_msg(), &statbuf)) {
  		/*
@@@ -776,7 -807,7 +775,7 @@@
  		struct ident_split ci, ai;
  
  		if (whence != FROM_COMMIT) {
 -			if (cleanup_mode == CLEANUP_SCISSORS)
 +			if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
  				wt_status_add_cut_line(s->fp);
  			status_printf_ln(s, GIT_COLOR_NORMAL,
  			    whence == FROM_MERGE
@@@ -796,15 -827,14 +795,15 @@@
  		}
  
  		fprintf(s->fp, "\n");
 -		if (cleanup_mode == CLEANUP_ALL)
 +		if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL)
  			status_printf(s, GIT_COLOR_NORMAL,
  				_("Please enter the commit message for your changes."
  				  " Lines starting\nwith '%c' will be ignored, and an empty"
  				  " message aborts the commit.\n"), comment_line_char);
 -		else if (cleanup_mode == CLEANUP_SCISSORS && whence == FROM_COMMIT)
 +		else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
 +			 whence == FROM_COMMIT)
  			wt_status_add_cut_line(s->fp);
 -		else /* CLEANUP_SPACE, that is. */
 +		else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
  			status_printf(s, GIT_COLOR_NORMAL,
  				_("Please enter the commit message for your changes."
  				  " Lines starting\n"
@@@ -860,7 -890,7 +859,7 @@@
  		if (amend)
  			parent = "HEAD^1";
  
 -		if (get_sha1(parent, oid.hash)) {
 +		if (get_oid(parent, &oid)) {
  			int i, ita_nr = 0;
  
  			for (i = 0; i < active_nr; i++)
@@@ -877,12 -907,11 +876,12 @@@
  			 * submodules which were manually staged, which would
  			 * be really confusing.
  			 */
 -			int diff_flags = DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
 +			struct diff_flags flags = DIFF_FLAGS_INIT;
 +			flags.override_submodule_config = 1;
  			if (ignore_submodule_arg &&
  			    !strcmp(ignore_submodule_arg, "all"))
 -				diff_flags |= DIFF_OPT_IGNORE_SUBMODULES;
 -			commitable = index_differs_from(parent, diff_flags, 1);
 +				flags.ignore_submodules = 1;
 +			commitable = index_differs_from(parent, &flags, 1);
  		}
  	}
  	strbuf_release(&committer_ident);
@@@ -910,16 -939,13 +909,16 @@@
  		return 0;
  	}
  
 -	/*
 -	 * 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();
 +	if (!no_verify && find_hook("pre-commit")) {
 +		/*
 +		 * 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 (update_main_cache_tree(0)) {
  		error(_("Error building trees"));
  		return 0;
@@@ -949,6 -975,65 +948,6 @@@
  	return 1;
  }
  
 -static int rest_is_empty(struct strbuf *sb, int start)
 -{
 -	int i, eol;
 -	const char *nl;
 -
 -	/* Check if the rest is just whitespace and Signed-off-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 &&
 -		    starts_with(sb->buf + i, sign_off_header)) {
 -			i = eol;
 -			continue;
 -		}
 -		while (i < eol)
 -			if (!isspace(sb->buf[i++]))
 -				return 0;
 -	}
 -
 -	return 1;
 -}
 -
 -/*
 - * Find out if the message in the strbuf contains only whitespace and
 - * Signed-off-by lines.
 - */
 -static int message_is_empty(struct strbuf *sb)
 -{
 -	if (cleanup_mode == CLEANUP_NONE && sb->len)
 -		return 0;
 -	return rest_is_empty(sb, 0);
 -}
 -
 -/*
 - * See if the user edited the message in the editor or left what
 - * was in the template intact
 - */
 -static int template_untouched(struct strbuf *sb)
 -{
 -	struct strbuf tmpl = STRBUF_INIT;
 -	const char *start;
 -
 -	if (cleanup_mode == CLEANUP_NONE && sb->len)
 -		return 0;
 -
 -	if (!template_file || strbuf_read_file(&tmpl, template_file, 0) <= 0)
 -		return 0;
 -
 -	strbuf_stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
 -	if (!skip_prefix(sb->buf, tmpl.buf, &start))
 -		start = sb->buf;
 -	strbuf_release(&tmpl);
 -	return rest_is_empty(sb, start - sb->buf);
 -}
 -
  static const char *find_author_by_nickname(const char *name)
  {
  	struct rev_info revs;
@@@ -982,19 -1067,6 +981,19 @@@
  	die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
  }
  
 +static void handle_ignored_arg(struct wt_status *s)
 +{
 +	if (!ignored_arg)
 +		; /* default already initialized */
 +	else if (!strcmp(ignored_arg, "traditional"))
 +		s->show_ignored_mode = SHOW_TRADITIONAL_IGNORED;
 +	else if (!strcmp(ignored_arg, "no"))
 +		s->show_ignored_mode = SHOW_NO_IGNORED;
 +	else if (!strcmp(ignored_arg, "matching"))
 +		s->show_ignored_mode = SHOW_MATCHING_IGNORED;
 +	else
 +		die(_("Invalid ignored mode '%s'"), ignored_arg);
 +}
  
  static void handle_untracked_files_arg(struct wt_status *s)
  {
@@@ -1057,9 -1129,6 +1056,9 @@@ static void finalize_deferred_config(st
  		s->show_branch = status_deferred_config.show_branch;
  	if (s->show_branch < 0)
  		s->show_branch = 0;
 +
 +	if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
 +		s->ahead_behind_flags = AHEAD_BEHIND_FULL;
  }
  
  static int parse_and_validate_options(int argc, const char *argv[],
@@@ -1106,8 -1175,8 +1105,8 @@@
  		f++;
  	if (f > 1)
  		die(_("Only one of -c/-C/-F/--fixup can be used."));
 -	if (have_option_m && f > 0)
 -		die((_("Option -m cannot be combined with -c/-C/-F/--fixup.")));
 +	if (have_option_m && (edit_message || use_message || logfile))
 +		die((_("Option -m cannot be combined with -c/-C/-F.")));
  	if (f || have_option_m)
  		template_file = NULL;
  	if (edit_message)
@@@ -1136,17 -1205,15 +1135,17 @@@
  	if (argc == 0 && (also || (only && !amend && !allow_empty)))
  		die(_("No paths with --include/--only does not make sense."));
  	if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
 -		cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
 +		cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_ALL :
 +					    COMMIT_MSG_CLEANUP_SPACE;
  	else if (!strcmp(cleanup_arg, "verbatim"))
 -		cleanup_mode = CLEANUP_NONE;
 +		cleanup_mode = COMMIT_MSG_CLEANUP_NONE;
  	else if (!strcmp(cleanup_arg, "whitespace"))
 -		cleanup_mode = CLEANUP_SPACE;
 +		cleanup_mode = COMMIT_MSG_CLEANUP_SPACE;
  	else if (!strcmp(cleanup_arg, "strip"))
 -		cleanup_mode = CLEANUP_ALL;
 +		cleanup_mode = COMMIT_MSG_CLEANUP_ALL;
  	else if (!strcmp(cleanup_arg, "scissors"))
 -		cleanup_mode = use_editor ? CLEANUP_SCISSORS : CLEANUP_SPACE;
 +		cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
 +					    COMMIT_MSG_CLEANUP_SPACE;
  	else
  		die(_("Invalid cleanup mode %s"), cleanup_arg);
  
@@@ -1276,8 -1343,6 +1275,8 @@@ int cmd_status(int argc, const char **a
  			 N_("show branch information")),
  		OPT_BOOL(0, "show-stash", &s.show_stash,
  			 N_("show stash information")),
 +		OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
 +			 N_("compute full ahead/behind values")),
  		{ OPTION_CALLBACK, 0, "porcelain", &status_format,
  		  N_("version"), N_("machine-readable output"),
  		  PARSE_OPT_OPTARG, opt_parse_porcelain },
@@@ -1290,10 -1355,8 +1289,10 @@@
  		  N_("mode"),
  		  N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
  		  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 -		OPT_BOOL(0, "ignored", &show_ignored_in_status,
 -			 N_("show ignored files")),
 +		{ OPTION_STRING, 0, "ignored", &ignored_arg,
 +		  N_("mode"),
 +		  N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"),
 +		  PARSE_OPT_OPTARG, NULL, (intptr_t)"traditional" },
  		{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"),
  		  N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
  		  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
@@@ -1312,12 -1375,8 +1311,12 @@@
  	finalize_deferred_config(&s);
  
  	handle_untracked_files_arg(&s);
 -	if (show_ignored_in_status)
 -		s.show_ignored_files = 1;
 +	handle_ignored_arg(&s);
 +
 +	if (s.show_ignored_mode == SHOW_MATCHING_IGNORED &&
 +	    s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
 +		die(_("Unsupported combination of ignored and untracked-files arguments"));
 +
  	parse_pathspec(&s.pathspec, 0,
  		       PATHSPEC_PREFER_FULL,
  		       prefix, argv);
@@@ -1325,12 -1384,9 +1324,12 @@@
  	read_cache_preload(&s.pathspec);
  	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
  
 -	fd = hold_locked_index(&index_lock, 0);
 +	if (use_optional_locks())
 +		fd = hold_locked_index(&index_lock, 0);
 +	else
 +		fd = -1;
  
 -	s.is_initial = get_sha1(s.reference, oid.hash) ? 1 : 0;
 +	s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
  	if (!s.is_initial)
  		hashcpy(s.sha1_commit, oid.hash);
  
@@@ -1350,6 -1406,97 +1349,6 @@@
  	return 0;
  }
  
 -static const char *implicit_ident_advice(void)
 -{
 -	char *user_config = expand_user_path("~/.gitconfig", 0);
 -	char *xdg_config = xdg_config_home("config");
 -	int config_exists = file_exists(user_config) || file_exists(xdg_config);
 -
 -	free(user_config);
 -	free(xdg_config);
 -
 -	if (config_exists)
 -		return _(implicit_ident_advice_config);
 -	else
 -		return _(implicit_ident_advice_noconfig);
 -
 -}
 -
 -static void print_summary(const char *prefix, const struct object_id *oid,
 -			  int initial_commit)
 -{
 -	struct rev_info rev;
 -	struct commit *commit;
 -	struct strbuf format = STRBUF_INIT;
 -	struct object_id junk_oid;
 -	const char *head;
 -	struct pretty_print_context pctx = {0};
 -	struct strbuf author_ident = STRBUF_INIT;
 -	struct strbuf committer_ident = STRBUF_INIT;
 -
 -	commit = lookup_commit(oid);
 -	if (!commit)
 -		die(_("couldn't look up newly created commit"));
 -	if (parse_commit(commit))
 -		die(_("could not parse newly created commit"));
 -
 -	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);
 -	}
 -	if (author_date_is_interesting()) {
 -		struct strbuf date = STRBUF_INIT;
 -		format_commit_message(commit, "%ad", &date, &pctx);
 -		strbuf_addstr(&format, "\n Date: ");
 -		strbuf_addbuf_percentquote(&format, &date);
 -		strbuf_release(&date);
 -	}
 -	if (!committer_ident_sufficiently_given()) {
 -		strbuf_addstr(&format, "\n Committer: ");
 -		strbuf_addbuf_percentquote(&format, &committer_ident);
 -		if (advice_implicit_identity) {
 -			strbuf_addch(&format, '\n');
 -			strbuf_addstr(&format, implicit_ident_advice());
 -		}
 -	}
 -	strbuf_release(&author_ident);
 -	strbuf_release(&committer_ident);
 -
 -	init_revisions(&rev, prefix);
 -	setup_revisions(0, NULL, &rev, NULL);
 -
 -	rev.diff = 1;
 -	rev.diffopt.output_format =
 -		DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
 -
 -	rev.verbose_header = 1;
 -	rev.show_root_diff = 1;
 -	get_commit_format(format.buf, &rev);
 -	rev.always_show_header = 0;
 -	rev.diffopt.detect_rename = 1;
 -	rev.diffopt.break_opt = 0;
 -	diff_setup_done(&rev.diffopt);
 -
 -	head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
 -	if (!strcmp(head, "HEAD"))
 -		head = _("detached HEAD");
 -	else
 -		skip_prefix(head, "refs/heads/", &head);
 -	printf("[%s%s ", head, initial_commit ? _(" (root-commit)") : "");
 -
 -	if (!log_tree_commit(&rev, commit)) {
 -		rev.always_show_header = 1;
 -		rev.use_terminator = 1;
 -		log_tree_commit(&rev, commit);
 -	}
 -
 -	strbuf_release(&format);
 -}
 -
  static int git_commit_config(const char *k, const char *v, void *cb)
  {
  	struct wt_status *s = cb;
@@@ -1379,6 -1526,37 +1378,6 @@@
  	return git_status_config(k, v, s);
  }
  
 -static int run_rewrite_hook(const struct object_id *oldoid,
 -			    const struct object_id *newoid)
 -{
 -	struct child_process proc = CHILD_PROCESS_INIT;
 -	const char *argv[3];
 -	int code;
 -	struct strbuf sb = STRBUF_INIT;
 -
 -	argv[0] = find_hook("post-rewrite");
 -	if (!argv[0])
 -		return 0;
 -
 -	argv[1] = "amend";
 -	argv[2] = NULL;
 -
 -	proc.argv = argv;
 -	proc.in = -1;
 -	proc.stdout_to_stderr = 1;
 -
 -	code = start_command(&proc);
 -	if (code)
 -		return code;
 -	strbuf_addf(&sb, "%s %s\n", oid_to_hex(oldoid), oid_to_hex(newoid));
 -	sigchain_push(SIGPIPE, SIG_IGN);
 -	write_in_full(proc.in, sb.buf, sb.len);
 -	close(proc.in);
 -	strbuf_release(&sb);
 -	sigchain_pop(SIGPIPE);
 -	return finish_command(&proc);
 -}
 -
  int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...)
  {
  	struct argv_array hook_env = ARGV_ARRAY_INIT;
@@@ -1403,7 -1581,6 +1402,7 @@@
  
  int cmd_commit(int argc, const char **argv, const char *prefix)
  {
 +	const char *argv_gc_auto[] = {"gc", "--auto", NULL};
  	static struct wt_status s;
  	static struct option builtin_commit_options[] = {
  		OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
@@@ -1439,8 -1616,6 +1438,8 @@@
  		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
  			    STATUS_FORMAT_SHORT),
  		OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")),
 +		OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
 +			 N_("compute full ahead/behind values")),
  		OPT_SET_INT(0, "porcelain", &status_format,
  			    N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
  		OPT_SET_INT(0, "long", &status_format,
@@@ -1464,11 -1639,13 +1463,11 @@@
  	struct strbuf sb = STRBUF_INIT;
  	struct strbuf author_ident = STRBUF_INIT;
  	const char *index_file, *reflog_msg;
 -	char *nl;
  	struct object_id oid;
  	struct commit_list *parents = NULL;
  	struct stat statbuf;
  	struct commit *current_head = NULL;
  	struct commit_extra_header *extra = NULL;
 -	struct ref_transaction *transaction;
  	struct strbuf err = STRBUF_INIT;
  
  	if (argc == 2 && !strcmp(argv[1], "-h"))
@@@ -1479,7 -1656,7 +1478,7 @@@
  	status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
  	s.colopts = 0;
  
 -	if (get_sha1("HEAD", oid.hash))
 +	if (get_oid("HEAD", &oid))
  		current_head = NULL;
  	else {
  		current_head = lookup_commit_or_die(&oid, "HEAD");
@@@ -1541,7 -1718,7 +1540,7 @@@
  				allow_fast_forward = 0;
  		}
  		if (allow_fast_forward)
 -			parents = reduce_heads(parents);
 +			reduce_heads_replace(&parents);
  	} else {
  		if (!reflog_msg)
  			reflog_msg = (whence == FROM_CHERRY_PICK)
@@@ -1559,17 -1736,17 +1558,17 @@@
  	}
  
  	if (verbose || /* Truncate the message just before the diff, if any. */
 -	    cleanup_mode == CLEANUP_SCISSORS)
 +	    cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
  		strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len));
 -	if (cleanup_mode != CLEANUP_NONE)
 -		strbuf_stripspace(&sb, cleanup_mode == CLEANUP_ALL);
 +	if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE)
 +		strbuf_stripspace(&sb, cleanup_mode == COMMIT_MSG_CLEANUP_ALL);
  
 -	if (message_is_empty(&sb) && !allow_empty_message) {
 +	if (message_is_empty(&sb, cleanup_mode) && !allow_empty_message) {
  		rollback_index_files();
  		fprintf(stderr, _("Aborting commit due to empty commit message.\n"));
  		exit(1);
  	}
 -	if (template_untouched(&sb) && !allow_empty_message) {
 +	if (template_untouched(&sb, template_file, cleanup_mode) && !allow_empty_message) {
  		rollback_index_files();
  		fprintf(stderr, _("Aborting commit; you did not edit the message.\n"));
  		exit(1);
@@@ -1583,20 -1760,33 +1582,20 @@@
  		append_merge_tag_headers(parents, &tail);
  	}
  
 -	if (commit_tree_extended(sb.buf, sb.len, active_cache_tree->oid.hash,
 -			 parents, oid.hash, author_ident.buf, sign_commit, extra)) {
 +	if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
 +				 parents, &oid, author_ident.buf, sign_commit,
 +				 extra)) {
  		rollback_index_files();
  		die(_("failed to write commit object"));
  	}
  	strbuf_release(&author_ident);
  	free_commit_extra_headers(extra);
  
 -	nl = strchr(sb.buf, '\n');
 -	if (nl)
 -		strbuf_setlen(&sb, nl + 1 - sb.buf);
 -	else
 -		strbuf_addch(&sb, '\n');
 -	strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
 -	strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
 -
 -	transaction = ref_transaction_begin(&err);
 -	if (!transaction ||
 -	    ref_transaction_update(transaction, "HEAD", oid.hash,
 -				   current_head
 -				   ? current_head->object.oid.hash : null_sha1,
 -				   0, sb.buf, &err) ||
 -	    ref_transaction_commit(transaction, &err)) {
 +	if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
 +				    &err)) {
  		rollback_index_files();
  		die("%s", err.buf);
  	}
 -	ref_transaction_free(transaction);
  
  	unlink(git_path_cherry_pick_head());
  	unlink(git_path_revert_head());
@@@ -1611,22 -1801,20 +1610,22 @@@
  		     "not exceeded, and then \"git reset HEAD\" to recover."));
  
  	rerere(0);
 +	run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
  	run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
  	if (amend && !no_post_rewrite) {
 -		struct notes_rewrite_cfg *cfg;
 -		cfg = init_copy_notes_for_rewrite("amend");
 -		if (cfg) {
 -			/* we are amending, so current_head is not NULL */
 -			copy_note_for_rewrite(cfg, &current_head->object.oid, &oid);
 -			finish_copy_notes_for_rewrite(cfg, "Notes added by 'git commit --amend'");
 -		}
 -		run_rewrite_hook(&current_head->object.oid, &oid);
 +		commit_post_rewrite(current_head, &oid);
 +	}
 +	if (!quiet) {
 +		unsigned int flags = 0;
 +
 +		if (!current_head)
 +			flags |= SUMMARY_INITIAL_COMMIT;
 +		if (author_date_is_interesting())
 +			flags |= SUMMARY_SHOW_AUTHOR_DATE;
 +		print_commit_summary(prefix, &oid, flags);
  	}
 -	if (!quiet)
 -		print_summary(prefix, &oid, !current_head);
  
 -	strbuf_release(&err);
 +	UNLEAK(err);
 +	UNLEAK(sb);
  	return 0;
  }