From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 11:39:01 +0000 (+0900)
Subject: Merge branch 'js/builtin-rebase-perf-fix-err-fix'
X-Git-Tag: v2.20.0-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c17f086ecad796b4179aa1b0209f00d4f8ffdc0f?ds=inline;hp=-c

Merge branch 'js/builtin-rebase-perf-fix-err-fix'

The object name of the tree reported in a recently added error
message was wrong, which has been corrected.

* js/builtin-rebase-perf-fix-err-fix:
rebase: warn about the correct tree's OID
---

c17f086ecad796b4179aa1b0209f00d4f8ffdc0f
diff --combined builtin/rebase.c
index 1a2758756a,f4f29a3174..5b3e5baec8
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -23,7 -23,6 +23,7 @@@
  #include "revision.h"
  #include "commit-reach.h"
  #include "rerere.h"
 +#include "branch.h"
  
  static char const * const builtin_rebase_usage[] = {
  	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
@@@ -49,10 -48,7 +49,10 @@@ static int use_builtin_rebase(void
  {
  	struct child_process cp = CHILD_PROCESS_INIT;
  	struct strbuf out = STRBUF_INIT;
 -	int ret;
 +	int ret, env = git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1);
 +
 +	if (env != -1)
 +		return env;
  
  	argv_array_pushl(&cp.args,
  			 "config", "--bool", "rebase.usebuiltin", NULL);
@@@ -91,7 -87,7 +91,7 @@@ struct rebase_options 
  		REBASE_FORCE = 1<<3,
  		REBASE_INTERACTIVE_EXPLICIT = 1<<4,
  	} flags;
 -	struct strbuf git_am_opt;
 +	struct argv_array git_am_opts;
  	const char *action;
  	int signoff;
  	int allow_rerere_autoupdate;
@@@ -343,7 -339,7 +343,7 @@@ N_("Resolve all conflicts manually, mar
  static int run_specific_rebase(struct rebase_options *opts)
  {
  	const char *argv[] = { NULL, NULL };
 -	struct strbuf script_snippet = STRBUF_INIT;
 +	struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
  	int status;
  	const char *backend, *backend_func;
  
@@@ -437,9 -433,7 +437,9 @@@
  		oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
  	add_var(&script_snippet, "GIT_QUIET",
  		opts->flags & REBASE_NO_QUIET ? "" : "t");
 -	add_var(&script_snippet, "git_am_opt", opts->git_am_opt.buf);
 +	sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
 +	add_var(&script_snippet, "git_am_opt", buf.buf);
 +	strbuf_release(&buf);
  	add_var(&script_snippet, "verbose",
  		opts->flags & REBASE_VERBOSE ? "t" : "");
  	add_var(&script_snippet, "diffstat",
@@@ -582,7 -576,8 +582,8 @@@ static int reset_head(struct object_id 
  	}
  
  	if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {
- 		ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
+ 		ret = error(_("failed to find tree of %s"),
+ 			    oid_to_hex(&head_oid));
  		goto leave_reset_head;
  	}
  
@@@ -626,8 -621,7 +627,8 @@@
  		reflog_head = msg.buf;
  	}
  	if (!switch_to_branch)
 -		ret = update_ref(reflog_head, "HEAD", oid, orig, REF_NO_DEREF,
 +		ret = update_ref(reflog_head, "HEAD", oid, orig,
 +				 detach_head ? REF_NO_DEREF : 0,
  				 UPDATE_REFS_MSG_ON_ERR);
  	else {
  		ret = create_symref("HEAD", switch_to_branch, msg.buf);
@@@ -721,9 -715,6 +722,9 @@@ static int parse_opt_merge(const struc
  {
  	struct rebase_options *opts = opt->value;
  
 +	BUG_ON_OPT_NEG(unset);
 +	BUG_ON_OPT_ARG(arg);
 +
  	if (!is_interactive(opts))
  		opts->type = REBASE_MERGE;
  
@@@ -736,9 -727,6 +737,9 @@@ static int parse_opt_interactive(const 
  {
  	struct rebase_options *opts = opt->value;
  
 +	BUG_ON_OPT_NEG(unset);
 +	BUG_ON_OPT_ARG(arg);
 +
  	opts->type = REBASE_INTERACTIVE;
  	opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
  
@@@ -780,7 -768,7 +781,7 @@@ int cmd_rebase(int argc, const char **a
  	struct rebase_options options = {
  		.type = REBASE_UNSPECIFIED,
  		.flags = REBASE_NO_QUIET,
 -		.git_am_opt = STRBUF_INIT,
 +		.git_am_opts = ARGV_ARRAY_INIT,
  		.allow_rerere_autoupdate  = -1,
  		.allow_empty_message = 1,
  		.git_format_patch_opt = STRBUF_INIT,
@@@ -801,7 -789,12 +802,7 @@@
  		ACTION_EDIT_TODO,
  		ACTION_SHOW_CURRENT_PATCH,
  	} action = NO_ACTION;
 -	int committer_date_is_author_date = 0;
 -	int ignore_date = 0;
 -	int ignore_whitespace = 0;
  	const char *gpg_sign = NULL;
 -	int opt_c = -1;
 -	struct string_list whitespace = STRING_LIST_INIT_NODUP;
  	struct string_list exec = STRING_LIST_INIT_NODUP;
  	const char *rebase_merges = NULL;
  	int fork_point = -1;
@@@ -823,20 -816,15 +824,20 @@@
  		{OPTION_NEGBIT, 'n', "no-stat", &options.flags, NULL,
  			N_("do not show diffstat of what changed upstream"),
  			PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
 -		OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
 -			 N_("passed to 'git apply'")),
  		OPT_BOOL(0, "signoff", &options.signoff,
  			 N_("add a Signed-off-by: line to each commit")),
 -		OPT_BOOL(0, "committer-date-is-author-date",
 -			 &committer_date_is_author_date,
 -			 N_("passed to 'git am'")),
 -		OPT_BOOL(0, "ignore-date", &ignore_date,
 -			 N_("passed to 'git am'")),
 +		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
 +				  NULL, N_("passed to 'git am'"),
 +				  PARSE_OPT_NOARG),
 +		OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
 +				  &options.git_am_opts, NULL,
 +				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
 +		OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
 +				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
 +		OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
 +				  N_("passed to 'git apply'"), 0),
 +		OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
 +				  N_("action"), N_("passed to 'git apply'"), 0),
  		OPT_BIT('f', "force-rebase", &options.flags,
  			N_("cherry-pick all commits, even if unchanged"),
  			REBASE_FORCE),
@@@ -880,6 -868,10 +881,6 @@@
  		{ OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
  			N_("GPG-sign commits"),
  			PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 -		OPT_STRING_LIST(0, "whitespace", &whitespace,
 -				N_("whitespace"), N_("passed to 'git apply'")),
 -		OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"),
 -			    REBASE_AM),
  		OPT_BOOL(0, "autostash", &options.autostash,
  			 N_("automatically stash/stash pop before and after")),
  		OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
@@@ -904,7 -896,6 +905,7 @@@
  			 N_("rebase all reachable commits up to the root(s)")),
  		OPT_END(),
  	};
 +	int i;
  
  	/*
  	 * NEEDSWORK: Once the builtin rebase has been tested enough
@@@ -1024,7 -1015,6 +1025,7 @@@
  		if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD,
  			       NULL, NULL) < 0)
  			die(_("could not discard worktree changes"));
 +		remove_branch_state();
  		if (read_basic_state(&options))
  			exit(1);
  		goto run_rebase;
@@@ -1043,7 -1033,6 +1044,7 @@@
  			       NULL, NULL) < 0)
  			die(_("could not move back to %s"),
  			    oid_to_hex(&options.orig_head));
 +		remove_branch_state();
  		ret = finish_rebase(&options);
  		goto cleanup;
  	}
@@@ -1089,27 -1078,22 +1090,27 @@@
  		    state_dir_base, cmd_live_rebase, buf.buf);
  	}
  
 -	if (!(options.flags & REBASE_NO_QUIET))
 -		strbuf_addstr(&options.git_am_opt, " -q");
 -
 -	if (committer_date_is_author_date) {
 -		strbuf_addstr(&options.git_am_opt,
 -			      " --committer-date-is-author-date");
 -		options.flags |= REBASE_FORCE;
 +	for (i = 0; i < options.git_am_opts.argc; i++) {
 +		const char *option = options.git_am_opts.argv[i], *p;
 +		if (!strcmp(option, "--committer-date-is-author-date") ||
 +		    !strcmp(option, "--ignore-date") ||
 +		    !strcmp(option, "--whitespace=fix") ||
 +		    !strcmp(option, "--whitespace=strip"))
 +			options.flags |= REBASE_FORCE;
 +		else if (skip_prefix(option, "-C", &p)) {
 +			while (*p)
 +				if (!isdigit(*(p++)))
 +					die(_("switch `C' expects a "
 +					      "numerical value"));
 +		} else if (skip_prefix(option, "--whitespace=", &p)) {
 +			if (*p && strcmp(p, "warn") && strcmp(p, "nowarn") &&
 +			    strcmp(p, "error") && strcmp(p, "error-all"))
 +				die("Invalid whitespace option: '%s'", p);
 +		}
  	}
  
 -	if (ignore_whitespace)
 -		strbuf_addstr(&options.git_am_opt, " --ignore-whitespace");
 -
 -	if (ignore_date) {
 -		strbuf_addstr(&options.git_am_opt, " --ignore-date");
 -		options.flags |= REBASE_FORCE;
 -	}
 +	if (!(options.flags & REBASE_NO_QUIET))
 +		argv_array_push(&options.git_am_opts, "-q");
  
  	if (options.keep_empty)
  		imply_interactive(&options, "--keep-empty");
@@@ -1119,6 -1103,23 +1120,6 @@@
  		options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
  	}
  
 -	if (opt_c >= 0)
 -		strbuf_addf(&options.git_am_opt, " -C%d", opt_c);
 -
 -	if (whitespace.nr) {
 -		int i;
 -
 -		for (i = 0; i < whitespace.nr; i++) {
 -			const char *item = whitespace.items[i].string;
 -
 -			strbuf_addf(&options.git_am_opt, " --whitespace=%s",
 -				    item);
 -
 -			if ((!strcmp(item, "fix")) || (!strcmp(item, "strip")))
 -				options.flags |= REBASE_FORCE;
 -		}
 -	}
 -
  	if (exec.nr) {
  		int i;
  
@@@ -1194,18 -1195,23 +1195,18 @@@
  		break;
  	}
  
 -	if (options.git_am_opt.len) {
 -		const char *p;
 -
 +	if (options.git_am_opts.argc) {
  		/* all am options except -q are compatible only with --am */
 -		strbuf_reset(&buf);
 -		strbuf_addbuf(&buf, &options.git_am_opt);
 -		strbuf_addch(&buf, ' ');
 -		while ((p = strstr(buf.buf, " -q ")))
 -			strbuf_splice(&buf, p - buf.buf, 4, " ", 1);
 -		strbuf_trim(&buf);
 +		for (i = options.git_am_opts.argc - 1; i >= 0; i--)
 +			if (strcmp(options.git_am_opts.argv[i], "-q"))
 +				break;
  
 -		if (is_interactive(&options) && buf.len)
 +		if (is_interactive(&options) && i >= 0)
  			die(_("error: cannot combine interactive options "
  			      "(--interactive, --exec, --rebase-merges, "
  			      "--preserve-merges, --keep-empty, --root + "
  			      "--onto) with am options (%s)"), buf.buf);
 -		if (options.type == REBASE_MERGE && buf.len)
 +		if (options.type == REBASE_MERGE && i >= 0)
  			die(_("error: cannot combine merge options (--merge, "
  			      "--strategy, --strategy-option) with am options "
  			      "(%s)"), buf.buf);
@@@ -1215,7 -1221,7 +1216,7 @@@
  		if (options.type == REBASE_PRESERVE_MERGES)
  			die("cannot combine '--signoff' with "
  			    "'--preserve-merges'");
 -		strbuf_addstr(&options.git_am_opt, " --signoff");
 +		argv_array_push(&options.git_am_opts, "--signoff");
  		options.flags |= REBASE_FORCE;
  	}