Revert "Merge branch 'ra/rebase-i-more-options'"

This reverts commit 5d9324e0f4, reversing
changes made to c58ae96fc4.

The topic turns out to be too buggy for real use.

cf. <f2fe7437-8a48-3315-4d3f-8d51fe4bb8f1@gmail.com>

Documentation/RelNotes/2.25.0.txt

@@ -53,9 +53,6 @@ UI, Workflows & Features
    or a named file, instead of taking it as the command line
    arguments, with the "--pathspec-from-file" option.
 
- * "git rebase -i" learned a few options that are known by "git
-   rebase" proper.
-
  * "git submodule" learned a subcommand "set-url".
 
  * "git log" family learned "--pretty=reference" that gives the name

Documentation/git-rebase.txt

@@ -393,31 +393,16 @@ your branch contains commits which were dropped, this option can be used
 with `--keep-base` in order to drop those commits from your branch.
 
 --ignore-whitespace::
-	Behaves differently depending on which backend is selected.
-+
-'am' backend: When applying a patch, ignore changes in whitespace in
-context lines if necessary.
-+
-'interactive' backend: Treat lines with only whitespace changes as
-unchanged for the sake of a three-way merge.
-
 --whitespace=<option>::
-	This flag is passed to the 'git apply' program
+	These flag are passed to the 'git apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
 +
 See also INCOMPATIBLE OPTIONS below.
 
 --committer-date-is-author-date::
-	Instead of recording the time the rebased commits are
-	created as the committer date, reuse the author date
-	as the committer date. This implies --force-rebase.
-
 --ignore-date::
---reset-author-date::
+	These flags are passed to 'git am' to easily change the dates
-	By default, the author date of the original commit is used
+	of the rebased commits (see linkgit:git-am[1]).
-	as the author date for the resulting commit.  This option
-	tells Git to use the current timestamp instead and implies
-	`--force-rebase`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -554,7 +539,10 @@ INCOMPATIBLE OPTIONS
 
 The following options:
 
+ * --committer-date-is-author-date
+ * --ignore-date
  * --whitespace
+ * --ignore-whitespace
  * -C
 
 are incompatible with the following options:
@@ -577,9 +565,6 @@ In addition, the following pairs of options are incompatible:
  * --preserve-merges and --interactive
  * --preserve-merges and --signoff
  * --preserve-merges and --rebase-merges
- * --preserve-merges and --ignore-whitespace
- * --preserve-merges and --committer-date-is-author-date
- * --preserve-merges and --ignore-date
  * --keep-base and --onto
  * --keep-base and --root
 

builtin/rebase.c

@@ -79,11 +79,8 @@ struct rebase_options {
 	int allow_rerere_autoupdate;
 	int keep_empty;
 	int autosquash;
-	int ignore_whitespace;
 	char *gpg_sign_opt;
 	int autostash;
-	int committer_date_is_author_date;
-	int ignore_date;
 	char *cmd;
 	int allow_empty_message;
 	int rebase_merges, rebase_cousins;
@@ -102,7 +99,6 @@ struct rebase_options {
 
 static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 {
-	struct strbuf strategy_buf = STRBUF_INIT;
 	struct replay_opts replay = REPLAY_OPTS_INIT;
 
 	replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -116,20 +112,10 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 	replay.allow_empty_message = opts->allow_empty_message;
 	replay.verbose = opts->flags & REBASE_VERBOSE;
 	replay.reschedule_failed_exec = opts->reschedule_failed_exec;
-	replay.committer_date_is_author_date =
-					opts->committer_date_is_author_date;
-	replay.ignore_date = opts->ignore_date;
 	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
 	replay.strategy = opts->strategy;
-
 	if (opts->strategy_opts)
-		strbuf_addstr(&strategy_buf, opts->strategy_opts);
+		parse_strategy_opts(&replay, opts->strategy_opts);
-	if (opts->ignore_whitespace)
-		strbuf_addstr(&strategy_buf, " --ignore-space-change");
-	if (strategy_buf.len)
-		parse_strategy_opts(&replay, strategy_buf.buf);
-
-	strbuf_release(&strategy_buf);
 
 	if (opts->squash_onto) {
 		oidcpy(&replay.squash_onto, opts->squash_onto);
@@ -531,8 +517,6 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options,
 			builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
 
-	opts.strategy_opts = xstrdup_or_null(opts.strategy_opts);
-
 	if (!is_null_oid(&squash_onto))
 		opts.squash_onto = &squash_onto;
 
@@ -986,12 +970,6 @@ static int run_am(struct rebase_options *opts)
 	am.git_cmd = 1;
 	argv_array_push(&am.args, "am");
 
-	if (opts->ignore_whitespace)
-		argv_array_push(&am.args, "--ignore-whitespace");
-	if (opts->committer_date_is_author_date)
-		argv_array_push(&opts->git_am_opts, "--committer-date-is-author-date");
-	if (opts->ignore_date)
-		argv_array_push(&opts->git_am_opts, "--ignore-date");
 	if (opts->action && !strcmp("continue", opts->action)) {
 		argv_array_push(&am.args, "--resolved");
 		argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
@@ -1459,17 +1437,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
 		OPT_BOOL(0, "signoff", &options.signoff,
 			 N_("add a Signed-off-by: line to each commit")),
-		OPT_BOOL(0, "committer-date-is-author-date",
+		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
-			 &options.committer_date_is_author_date,
+				  NULL, N_("passed to 'git am'"),
-			 N_("make committer date match author date")),
+				  PARSE_OPT_NOARG),
-		OPT_BOOL(0, "reset-author-date", &options.ignore_date,
+		OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
-			 N_("ignore author date and use current date")),
+				  &options.git_am_opts, NULL,
-		OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
+				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
-				N_("synonym of --reset-author-date")),
+		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_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,
-			 N_("ignore changes in whitespace")),
 		OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
 				  N_("action"), N_("passed to 'git apply'"), 0),
 		OPT_BIT('f', "force-rebase", &options.flags,
@@ -1742,13 +1719,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		    state_dir_base, cmd_live_rebase, buf.buf);
 	}
 
-	if (options.committer_date_is_author_date ||
-	    options.ignore_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, "--whitespace=fix") ||
+		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)) {

sequencer.c

@@ -147,8 +147,6 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete")
  * command-line.
  */
 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
-static GIT_PATH_FUNC(rebase_path_cdate_is_adate, "rebase-merge/cdate_is_adate")
-static GIT_PATH_FUNC(rebase_path_ignore_date, "rebase-merge/ignore_date")
 static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
 static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
 static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
@@ -825,19 +823,9 @@ int read_author_script(const char *path, char **name, char **email, char **date,
 		error(_("missing 'GIT_AUTHOR_DATE'"));
 	if (date_i < 0 || email_i < 0 || date_i < 0 || err)
 		goto finish;
-
-	if (name)
 	*name = kv.items[name_i].util;
-	else
-		free(kv.items[name_i].util);
-	if (email)
 	*email = kv.items[email_i].util;
-	else
-		free(kv.items[email_i].util);
-	if (date)
 	*date = kv.items[date_i].util;
-	else
-		free(kv.items[date_i].util);
 	retval = 0;
 finish:
 	string_list_clear(&kv, !!retval);
@@ -880,47 +868,6 @@ static char *get_author(const char *message)
 	return NULL;
 }
 
-/* Returns a "date" string that needs to be free()'d by the caller */
-static char *read_author_date_or_null(void)
-{
-	char *date;
-
-	if (read_author_script(rebase_path_author_script(),
-			       NULL, NULL, &date, 0))
-		return NULL;
-	return date;
-}
-
-/* Construct a free()able author string with current time as the author date */
-static char *ignore_author_date(const char *author)
-{
-	int len = strlen(author);
-	struct ident_split ident;
-	struct strbuf new_author = STRBUF_INIT;
-
-	if (split_ident_line(&ident, author, len) < 0) {
-		error(_("malformed ident line"));
-		return NULL;
-	}
-	len = ident.mail_end - ident.name_begin + 1;
-
-	strbuf_addf(&new_author, "%.*s ", len, ident.name_begin);
-	datestamp(&new_author);
-	return strbuf_detach(&new_author, NULL);
-}
-
-static void push_dates(struct child_process *child, int change_committer_date)
-{
-	time_t now = time(NULL);
-	struct strbuf date = STRBUF_INIT;
-
-	strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now);
-	argv_array_pushf(&child->env_array, "GIT_AUTHOR_DATE=%s", date.buf);
-	if (change_committer_date)
-		argv_array_pushf(&child->env_array, "GIT_COMMITTER_DATE=%s", date.buf);
-	strbuf_release(&date);
-}
-
 static const char staged_changes_advice[] =
 N_("you have staged changes in your working tree\n"
 "If these changes are meant to be squashed into the previous commit, run:\n"
@@ -980,25 +927,6 @@ static int run_git_commit(struct repository *r,
 
 	cmd.git_cmd = 1;
 
-	if (opts->committer_date_is_author_date) {
-		int res = -1;
-		struct strbuf datebuf = STRBUF_INIT;
-		char *date = read_author_date_or_null();
-
-		if (!date)
-			return -1;
-
-		strbuf_addf(&datebuf, "@%s", date);
-		res = setenv("GIT_COMMITTER_DATE",
-			     opts->ignore_date ? "" : datebuf.buf, 1);
-
-		strbuf_release(&datebuf);
-		free(date);
-
-		if (res)
-			return -1;
-	}
-
 	if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
 		const char *gpg_opt = gpg_sign_opt_quoted(opts);
 
@@ -1014,8 +942,6 @@ static int run_git_commit(struct repository *r,
 		argv_array_push(&cmd.args, "--amend");
 	if (opts->gpg_sign)
 		argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
-	if (opts->ignore_date)
-		push_dates(&cmd, opts->committer_date_is_author_date);
 	if (defmsg)
 		argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
 	else if (!(flags & EDIT_MSG))
@@ -1384,13 +1310,14 @@ static int try_to_commit(struct repository *r,
 	struct commit_extra_header *extra = NULL;
 	struct strbuf err = STRBUF_INIT;
 	struct strbuf commit_msg = STRBUF_INIT;
-	char *author_to_free = NULL;
+	char *amend_author = NULL;
 	const char *hook_commit = NULL;
 	enum commit_msg_cleanup_mode cleanup;
 	int res = 0;
 
 	if (parse_head(r, &current_head))
 		return -1;
+
 	if (flags & AMEND_MSG) {
 		const char *exclude_gpgsig[] = { "gpgsig", NULL };
 		const char *out_enc = get_commit_output_encoding();
@@ -1405,7 +1332,7 @@ static int try_to_commit(struct repository *r,
 			strbuf_addstr(msg, orig_message);
 			hook_commit = "HEAD";
 		}
-		author = author_to_free = get_author(message);
+		author = amend_author = get_author(message);
 		unuse_commit_buffer(current_head, message);
 		if (!author) {
 			res = error(_("unable to parse commit author"));
@@ -1418,31 +1345,6 @@ static int try_to_commit(struct repository *r,
 		commit_list_insert(current_head, &parents);
 	}
 
-	if (opts->committer_date_is_author_date) {
-		int len = strlen(author);
-		struct ident_split ident;
-		struct strbuf date = STRBUF_INIT;
-
-		if (split_ident_line(&ident, author, len) < 0) {
-			res = error(_("malformed ident line"));
-			goto out;
-		}
-		if (!ident.date_begin) {
-			res = error(_("corrupted author without date information"));
-			goto out;
-		}
-
-		strbuf_addf(&date, "@%.*s %.*s",
-			    (int)(ident.date_end - ident.date_begin), ident.date_begin,
-			    (int)(ident.tz_end - ident.tz_begin), ident.tz_begin);
-		res = setenv("GIT_COMMITTER_DATE",
-			     opts->ignore_date ? "" : date.buf, 1);
-		strbuf_release(&date);
-
-		if (res)
-			goto out;
-	}
-
 	if (write_index_as_tree(&tree, r->index, r->index_file, 0, NULL)) {
 		res = error(_("git write-tree failed to write a tree"));
 		goto out;
@@ -1502,15 +1404,6 @@ static int try_to_commit(struct repository *r,
 
 	reset_ident_date();
 
-	if (opts->ignore_date) {
-		author = ignore_author_date(author);
-		if (!author) {
-			res = -1;
-			goto out;
-		}
-		free(author_to_free);
-		author_to_free = (char *)author;
-	}
 	if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
 				 oid, author, opts->gpg_sign, extra)) {
 		res = error(_("failed to write commit object"));
@@ -1531,7 +1424,7 @@ out:
 	free_commit_extra_headers(extra);
 	strbuf_release(&err);
 	strbuf_release(&commit_msg);
-	free(author_to_free);
+	free(amend_author);
 
 	return res;
 }
@@ -2599,16 +2492,6 @@ static int read_populate_opts(struct replay_opts *opts)
 			opts->signoff = 1;
 		}
 
-		if (file_exists(rebase_path_cdate_is_adate())) {
-			opts->allow_ff = 0;
-			opts->committer_date_is_author_date = 1;
-		}
-
-		if (file_exists(rebase_path_ignore_date())) {
-			opts->allow_ff = 0;
-			opts->ignore_date = 1;
-		}
-
 		if (file_exists(rebase_path_reschedule_failed_exec()))
 			opts->reschedule_failed_exec = 1;
 
@@ -2691,10 +2574,6 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
 		write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
 	if (opts->signoff)
 		write_file(rebase_path_signoff(), "--signoff\n");
-	if (opts->committer_date_is_author_date)
-		write_file(rebase_path_cdate_is_adate(), "%s", "");
-	if (opts->ignore_date)
-		write_file(rebase_path_ignore_date(), "%s", "");
 	if (opts->reschedule_failed_exec)
 		write_file(rebase_path_reschedule_failed_exec(), "%s", "");
 
@@ -3635,8 +3514,6 @@ static int do_merge(struct repository *r,
 		argv_array_push(&cmd.args, git_path_merge_msg(r));
 		if (opts->gpg_sign)
 			argv_array_push(&cmd.args, opts->gpg_sign);
-		if (opts->ignore_date)
-			push_dates(&cmd, opts->committer_date_is_author_date);
 
 		/* Add the tips to be merged */
 		for (j = to_merge; j; j = j->next)
@@ -3909,9 +3786,7 @@ static int pick_commits(struct repository *r,
 	setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
 	if (opts->allow_ff)
 		assert(!(opts->signoff || opts->no_commit ||
-				opts->record_origin || opts->edit ||
+				opts->record_origin || opts->edit));
-				opts->committer_date_is_author_date ||
-				opts->ignore_date));
 	if (read_and_refresh_cache(r, opts))
 		return -1;
 

sequencer.h

@@ -43,8 +43,6 @@ struct replay_opts {
 	int verbose;
 	int quiet;
 	int reschedule_failed_exec;
-	int committer_date_is_author_date;
-	int ignore_date;
 
 	int mainline;
 

t/t3422-rebase-incompatible-options.sh

@@ -61,6 +61,8 @@ test_rebase_am_only () {
 }
 
 test_rebase_am_only --whitespace=fix
+test_rebase_am_only --ignore-whitespace
+test_rebase_am_only --committer-date-is-author-date
 test_rebase_am_only -C4
 
 test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '

t/t3433-rebase-options-compatibility.sh

@@ -1,131 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Rohit Ashiwal
-#
-
-test_description='tests to ensure compatibility between am and interactive backends'
-
-. ./test-lib.sh
-
-GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30"
-export GIT_AUTHOR_DATE
-
-# This is a special case in which both am and interactive backends
-# provide the same output. It was done intentionally because
-# both the backends fall short of optimal behaviour.
-test_expect_success 'setup' '
-	git checkout -b topic &&
-	q_to_tab >file <<-\EOF &&
-	line 1
-	Qline 2
-	line 3
-	EOF
-	git add file &&
-	git commit -m "add file" &&
-	cat >file <<-\EOF &&
-	line 1
-	new line 2
-	line 3
-	EOF
-	git commit -am "update file" &&
-	git tag side &&
-	test_commit commit1 foo foo1 &&
-	test_commit commit2 foo foo2 &&
-	test_commit commit3 foo foo3 &&
-
-	git checkout --orphan master &&
-	git rm --cached foo &&
-	rm foo &&
-	sed -e "s/^|//" >file <<-\EOF &&
-	|line 1
-	|        line 2
-	|line 3
-	EOF
-	git add file &&
-	git commit -m "add file" &&
-	git tag main
-'
-
-test_expect_success '--ignore-whitespace works with am backend' '
-	cat >expect <<-\EOF &&
-	line 1
-	new line 2
-	line 3
-	EOF
-	test_must_fail git rebase main side &&
-	git rebase --abort &&
-	git rebase --ignore-whitespace main side &&
-	test_cmp expect file
-'
-
-test_expect_success '--ignore-whitespace works with interactive backend' '
-	cat >expect <<-\EOF &&
-	line 1
-	new line 2
-	line 3
-	EOF
-	test_must_fail git rebase --merge main side &&
-	git rebase --abort &&
-	git rebase --merge --ignore-whitespace main side &&
-	test_cmp expect file
-'
-
-test_expect_success '--committer-date-is-author-date works with am backend' '
-	git commit --amend &&
-	git rebase --committer-date-is-author-date HEAD^ &&
-	git show HEAD --pretty="format:%ai" >authortime &&
-	git show HEAD --pretty="format:%ci" >committertime &&
-	test_cmp authortime committertime
-'
-
-test_expect_success '--committer-date-is-author-date works with interactive backend' '
-	git commit --amend &&
-	git rebase -i --committer-date-is-author-date HEAD^ &&
-	git show HEAD --pretty="format:%ai" >authortime &&
-	git show HEAD --pretty="format:%ci" >committertime &&
-	test_cmp authortime committertime
-'
-
-test_expect_success '--committer-date-is-author-date works with rebase -r' '
-	git checkout side &&
-	git merge --no-ff commit3 &&
-	git rebase -r --root --committer-date-is-author-date &&
-	git rev-list HEAD >rev_list &&
-	while read HASH
-	do
-		git show $HASH --pretty="format:%ai" >authortime
-		git show $HASH --pretty="format:%ci" >committertime
-		test_cmp authortime committertime
-	done <rev_list
-'
-
-# Checking for +0000 in author time is enough since default
-# timezone is UTC, but the timezone used while committing
-# sets to +0530.
-test_expect_success '--ignore-date works with am backend' '
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --ignore-date HEAD^ &&
-	git show HEAD --pretty="format:%ai" >authortime &&
-	grep "+0000" authortime
-'
-
-test_expect_success '--ignore-date works with interactive backend' '
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --ignore-date -i HEAD^ &&
-	git show HEAD --pretty="format:%ai" >authortime &&
-	grep "+0000" authortime
-'
-
-test_expect_success '--ignore-date works with rebase -r' '
-	git checkout side &&
-	git merge --no-ff commit3 &&
-	git rebase -r --root --ignore-date &&
-	git rev-list HEAD >rev_list &&
-	while read HASH
-	do
-		git show $HASH --pretty="format:%ai" >authortime
-		grep "+0000" authortime
-	done <rev_list
-'
-
-test_done