Merge branch 'js/retire-preserve-merges'
The "--preserve-merges" option of "git rebase" has been removed. * js/retire-preserve-merges: sequencer: restrict scope of a formerly public function rebase: remove a no-longer-used function rebase: stop mentioning the -p option in comments rebase: remove obsolete code comment rebase: drop the internal `rebase--interactive` command git-svn: drop support for `--preserve-merges` rebase: drop support for `--preserve-merges` pull: remove support for `--rebase=preserve` tests: stop testing `git rebase --preserve-merges` remote: warn about unhandled branch.<name>.rebase values t5520: do not use `pull.rebase=preserve`
This commit is contained in:
Junio C Hamano
commit
223a1bfb58
1
.github/workflows/main.yml
vendored
1
.github/workflows/main.yml
vendored
@ -198,7 +198,6 @@ jobs:
|
||||
shell: bash
|
||||
env:
|
||||
NO_SVN_TESTS: 1
|
||||
GIT_TEST_SKIP_REBASE_P: 1
|
||||
run: ci/run-test-slice.sh ${{matrix.nr}} 10
|
||||
- name: ci/print-test-failures.sh
|
||||
if: failure()
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -125,7 +125,6 @@
|
||||
/git-range-diff
|
||||
/git-read-tree
|
||||
/git-rebase
|
||||
/git-rebase--preserve-merges
|
||||
/git-receive-pack
|
||||
/git-reflog
|
||||
/git-remote
|
||||
|
||||
@ -85,10 +85,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
|
||||
so that the local merge commits are included in the rebase (see
|
||||
linkgit:git-rebase[1] for details).
|
||||
+
|
||||
When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
|
||||
`--preserve-merges` along to 'git rebase' so that locally committed merge
|
||||
commits will not be flattened by running 'git pull'.
|
||||
+
|
||||
When the value is `interactive` (or just 'i'), the rebase is run in interactive
|
||||
mode.
|
||||
+
|
||||
|
||||
@ -18,10 +18,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
|
||||
so that the local merge commits are included in the rebase (see
|
||||
linkgit:git-rebase[1] for details).
|
||||
+
|
||||
When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
|
||||
`--preserve-merges` along to 'git rebase' so that locally committed merge
|
||||
commits will not be flattened by running 'git pull'.
|
||||
+
|
||||
When the value is `interactive` (or just 'i'), the rebase is run in interactive
|
||||
mode.
|
||||
+
|
||||
|
||||
@ -105,7 +105,7 @@ Options related to merging
|
||||
include::merge-options.txt[]
|
||||
|
||||
-r::
|
||||
--rebase[=false|true|merges|preserve|interactive]::
|
||||
--rebase[=false|true|merges|interactive]::
|
||||
When true, rebase the current branch on top of the upstream
|
||||
branch after fetching. If there is a remote-tracking branch
|
||||
corresponding to the upstream branch and the upstream branch
|
||||
@ -116,10 +116,6 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that
|
||||
the local merge commits are included in the rebase (see
|
||||
linkgit:git-rebase[1] for details).
|
||||
+
|
||||
When set to `preserve` (deprecated in favor of `merges`), rebase with the
|
||||
`--preserve-merges` option passed to `git rebase` so that locally created
|
||||
merge commits will not be flattened.
|
||||
+
|
||||
When false, merge the upstream branch into the current branch.
|
||||
+
|
||||
When `interactive`, enable the interactive mode of rebase.
|
||||
|
||||
@ -527,29 +527,12 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s
|
||||
the `rebase-cousins` mode is turned on, such commits are instead rebased
|
||||
onto `<upstream>` (or `<onto>`, if specified).
|
||||
+
|
||||
The `--rebase-merges` mode is similar in spirit to the deprecated
|
||||
`--preserve-merges` but works with interactive rebases,
|
||||
where commits can be reordered, inserted and dropped at will.
|
||||
+
|
||||
It is currently only possible to recreate the merge commits using the
|
||||
`ort` merge strategy; different merge strategies can be used only via
|
||||
explicit `exec git merge -s <strategy> [...]` commands.
|
||||
+
|
||||
See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
|
||||
|
||||
-p::
|
||||
--preserve-merges::
|
||||
[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
|
||||
instead of flattening the history by replaying commits a merge commit
|
||||
introduces. Merge conflict resolutions or manual amendments to merge
|
||||
commits are not preserved.
|
||||
+
|
||||
This uses the `--interactive` machinery internally, but combining it
|
||||
with the `--interactive` option explicitly is generally not a good
|
||||
idea unless you know what you are doing (see BUGS below).
|
||||
+
|
||||
See also INCOMPATIBLE OPTIONS below.
|
||||
|
||||
-x <cmd>::
|
||||
--exec <cmd>::
|
||||
Append "exec <cmd>" after each line creating a commit in the
|
||||
@ -581,9 +564,6 @@ See also INCOMPATIBLE OPTIONS below.
|
||||
the root commit(s) on a branch. When used with --onto, it
|
||||
will skip changes already contained in <newbase> (instead of
|
||||
<upstream>) whereas without --onto it will operate on every change.
|
||||
When used together with both --onto and --preserve-merges,
|
||||
'all' root commits will be rewritten to have <newbase> as parent
|
||||
instead.
|
||||
+
|
||||
See also INCOMPATIBLE OPTIONS below.
|
||||
|
||||
@ -645,7 +625,6 @@ are incompatible with the following options:
|
||||
* --allow-empty-message
|
||||
* --[no-]autosquash
|
||||
* --rebase-merges
|
||||
* --preserve-merges
|
||||
* --interactive
|
||||
* --exec
|
||||
* --no-keep-empty
|
||||
@ -656,13 +635,6 @@ are incompatible with the following options:
|
||||
|
||||
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 --empty=
|
||||
* --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
|
||||
* --fork-point and --root
|
||||
@ -1280,29 +1252,6 @@ CONFIGURATION
|
||||
include::config/rebase.txt[]
|
||||
include::config/sequencer.txt[]
|
||||
|
||||
BUGS
|
||||
----
|
||||
The todo list presented by the deprecated `--preserve-merges --interactive`
|
||||
does not represent the topology of the revision graph (use `--rebase-merges`
|
||||
instead). Editing commits and rewording their commit messages should work
|
||||
fine, but attempts to reorder commits tend to produce counterintuitive results.
|
||||
Use `--rebase-merges` in such scenarios instead.
|
||||
|
||||
For example, an attempt to rearrange
|
||||
------------
|
||||
1 --- 2 --- 3 --- 4 --- 5
|
||||
------------
|
||||
to
|
||||
------------
|
||||
1 --- 2 --- 4 --- 3 --- 5
|
||||
------------
|
||||
by moving the "pick 4" line will result in the following history:
|
||||
------------
|
||||
3
|
||||
/
|
||||
1 --- 2 --- 4 --- 5
|
||||
------------
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
||||
@ -678,7 +678,6 @@ config key: svn.authorsProg
|
||||
--strategy=<strategy>::
|
||||
-p::
|
||||
--rebase-merges::
|
||||
--preserve-merges (DEPRECATED)::
|
||||
These are only used with the 'dcommit' and 'rebase' commands.
|
||||
+
|
||||
Passed directly to 'git rebase' when using 'dcommit' if a
|
||||
|
||||
2
Makefile
2
Makefile
@ -609,7 +609,6 @@ SCRIPT_SH += git-submodule.sh
|
||||
SCRIPT_SH += git-web--browse.sh
|
||||
|
||||
SCRIPT_LIB += git-mergetool--lib
|
||||
SCRIPT_LIB += git-rebase--preserve-merges
|
||||
SCRIPT_LIB += git-sh-i18n
|
||||
SCRIPT_LIB += git-sh-setup
|
||||
|
||||
@ -2637,7 +2636,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
|
||||
--keyword=__ --keyword=N__ --keyword="__n:1,2"
|
||||
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
|
||||
LOCALIZED_SH = $(SCRIPT_SH)
|
||||
LOCALIZED_SH += git-rebase--preserve-merges.sh
|
||||
LOCALIZED_SH += git-sh-setup.sh
|
||||
LOCALIZED_PERL = $(SCRIPT_PERL)
|
||||
|
||||
|
||||
@ -31,9 +31,8 @@
|
||||
/**
|
||||
* Parses the value of --rebase. If value is a false value, returns
|
||||
* REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
|
||||
* "merges", returns REBASE_MERGES. If value is "preserve", returns
|
||||
* REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
|
||||
* fatal is true, otherwise returns REBASE_INVALID.
|
||||
* "merges", returns REBASE_MERGES. If value is a invalid value, dies with
|
||||
* a fatal error if fatal is true, otherwise returns REBASE_INVALID.
|
||||
*/
|
||||
static enum rebase_type parse_config_rebase(const char *key, const char *value,
|
||||
int fatal)
|
||||
@ -127,7 +126,7 @@ static struct option pull_options[] = {
|
||||
/* Options passed to git-merge or git-rebase */
|
||||
OPT_GROUP(N_("Options related to merging")),
|
||||
OPT_CALLBACK_F('r', "rebase", &opt_rebase,
|
||||
"(false|true|merges|preserve|interactive)",
|
||||
"(false|true|merges|interactive)",
|
||||
N_("incorporate changes by rebasing rather than merging"),
|
||||
PARSE_OPT_OPTARG, parse_opt_rebase),
|
||||
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
|
||||
@ -884,8 +883,6 @@ static int run_rebase(const struct object_id *newbase,
|
||||
/* Options passed to git-rebase */
|
||||
if (opt_rebase == REBASE_MERGES)
|
||||
strvec_push(&args, "--rebase-merges");
|
||||
else if (opt_rebase == REBASE_PRESERVE)
|
||||
strvec_push(&args, "--preserve-merges");
|
||||
else if (opt_rebase == REBASE_INTERACTIVE)
|
||||
strvec_push(&args, "--interactive");
|
||||
if (opt_diffstat)
|
||||
|
||||
338
builtin/rebase.c
338
builtin/rebase.c
@ -48,8 +48,7 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge")
|
||||
enum rebase_type {
|
||||
REBASE_UNSPECIFIED = -1,
|
||||
REBASE_APPLY,
|
||||
REBASE_MERGE,
|
||||
REBASE_PRESERVE_MERGES
|
||||
REBASE_MERGE
|
||||
};
|
||||
|
||||
enum empty_type {
|
||||
@ -163,12 +162,7 @@ enum action {
|
||||
ACTION_ABORT,
|
||||
ACTION_QUIT,
|
||||
ACTION_EDIT_TODO,
|
||||
ACTION_SHOW_CURRENT_PATCH,
|
||||
ACTION_SHORTEN_OIDS,
|
||||
ACTION_EXPAND_OIDS,
|
||||
ACTION_CHECK_TODO_LIST,
|
||||
ACTION_REARRANGE_SQUASH,
|
||||
ACTION_ADD_EXEC
|
||||
ACTION_SHOW_CURRENT_PATCH
|
||||
};
|
||||
|
||||
static const char *action_names[] = { "undefined",
|
||||
@ -179,81 +173,6 @@ static const char *action_names[] = { "undefined",
|
||||
"edit_todo",
|
||||
"show_current_patch" };
|
||||
|
||||
static int add_exec_commands(struct string_list *commands)
|
||||
{
|
||||
const char *todo_file = rebase_path_todo();
|
||||
struct todo_list todo_list = TODO_LIST_INIT;
|
||||
int res;
|
||||
|
||||
if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
|
||||
return error_errno(_("could not read '%s'."), todo_file);
|
||||
|
||||
if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
|
||||
&todo_list)) {
|
||||
todo_list_release(&todo_list);
|
||||
return error(_("unusable todo list: '%s'"), todo_file);
|
||||
}
|
||||
|
||||
todo_list_add_exec_commands(&todo_list, commands);
|
||||
res = todo_list_write_to_file(the_repository, &todo_list,
|
||||
todo_file, NULL, NULL, -1, 0);
|
||||
todo_list_release(&todo_list);
|
||||
|
||||
if (res)
|
||||
return error_errno(_("could not write '%s'."), todo_file);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rearrange_squash_in_todo_file(void)
|
||||
{
|
||||
const char *todo_file = rebase_path_todo();
|
||||
struct todo_list todo_list = TODO_LIST_INIT;
|
||||
int res = 0;
|
||||
|
||||
if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
|
||||
return error_errno(_("could not read '%s'."), todo_file);
|
||||
if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
|
||||
&todo_list)) {
|
||||
todo_list_release(&todo_list);
|
||||
return error(_("unusable todo list: '%s'"), todo_file);
|
||||
}
|
||||
|
||||
res = todo_list_rearrange_squash(&todo_list);
|
||||
if (!res)
|
||||
res = todo_list_write_to_file(the_repository, &todo_list,
|
||||
todo_file, NULL, NULL, -1, 0);
|
||||
|
||||
todo_list_release(&todo_list);
|
||||
|
||||
if (res)
|
||||
return error_errno(_("could not write '%s'."), todo_file);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int transform_todo_file(unsigned flags)
|
||||
{
|
||||
const char *todo_file = rebase_path_todo();
|
||||
struct todo_list todo_list = TODO_LIST_INIT;
|
||||
int res;
|
||||
|
||||
if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
|
||||
return error_errno(_("could not read '%s'."), todo_file);
|
||||
|
||||
if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
|
||||
&todo_list)) {
|
||||
todo_list_release(&todo_list);
|
||||
return error(_("unusable todo list: '%s'"), todo_file);
|
||||
}
|
||||
|
||||
res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
|
||||
NULL, NULL, -1, flags);
|
||||
todo_list_release(&todo_list);
|
||||
|
||||
if (res)
|
||||
return error_errno(_("could not write '%s'."), todo_file);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int edit_todo_file(unsigned flags)
|
||||
{
|
||||
const char *todo_file = rebase_path_todo();
|
||||
@ -403,7 +322,6 @@ static int run_sequencer_rebase(struct rebase_options *opts,
|
||||
flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
|
||||
flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
|
||||
flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
|
||||
flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
|
||||
flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0;
|
||||
flags |= opts->flags & REBASE_NO_QUIET ? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS : 0;
|
||||
|
||||
@ -439,24 +357,6 @@ static int run_sequencer_rebase(struct rebase_options *opts,
|
||||
|
||||
break;
|
||||
}
|
||||
case ACTION_SHORTEN_OIDS:
|
||||
case ACTION_EXPAND_OIDS:
|
||||
ret = transform_todo_file(flags);
|
||||
break;
|
||||
case ACTION_CHECK_TODO_LIST:
|
||||
ret = check_todo_list_from_file(the_repository);
|
||||
break;
|
||||
case ACTION_REARRANGE_SQUASH:
|
||||
ret = rearrange_squash_in_todo_file();
|
||||
break;
|
||||
case ACTION_ADD_EXEC: {
|
||||
struct string_list commands = STRING_LIST_INIT_DUP;
|
||||
|
||||
split_exec_commands(opts->cmd, &commands);
|
||||
ret = add_exec_commands(&commands);
|
||||
string_list_clear(&commands, 0);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
BUG("invalid command '%d'", command);
|
||||
}
|
||||
@ -478,105 +378,9 @@ static int parse_opt_keep_empty(const struct option *opt, const char *arg,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char * const builtin_rebase_interactive_usage[] = {
|
||||
N_("git rebase--interactive [<options>]"),
|
||||
NULL
|
||||
};
|
||||
|
||||
int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct rebase_options opts = REBASE_OPTIONS_INIT;
|
||||
struct object_id squash_onto = *null_oid();
|
||||
enum action command = ACTION_NONE;
|
||||
struct option options[] = {
|
||||
OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
|
||||
REBASE_FORCE),
|
||||
OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
|
||||
N_("keep commits which start empty"),
|
||||
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
|
||||
parse_opt_keep_empty),
|
||||
OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
|
||||
N_("allow commits with empty messages"),
|
||||
PARSE_OPT_HIDDEN),
|
||||
OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
|
||||
OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
|
||||
N_("keep original branch points of cousins")),
|
||||
OPT_BOOL(0, "autosquash", &opts.autosquash,
|
||||
N_("move commits that begin with squash!/fixup!")),
|
||||
OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
|
||||
OPT_BIT('v', "verbose", &opts.flags,
|
||||
N_("display a diffstat of what changed upstream"),
|
||||
REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
|
||||
OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
|
||||
ACTION_CONTINUE),
|
||||
OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
|
||||
OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
|
||||
ACTION_EDIT_TODO),
|
||||
OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
|
||||
ACTION_SHOW_CURRENT_PATCH),
|
||||
OPT_CMDMODE(0, "shorten-ids", &command,
|
||||
N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
|
||||
OPT_CMDMODE(0, "expand-ids", &command,
|
||||
N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
|
||||
OPT_CMDMODE(0, "check-todo-list", &command,
|
||||
N_("check the todo list"), ACTION_CHECK_TODO_LIST),
|
||||
OPT_CMDMODE(0, "rearrange-squash", &command,
|
||||
N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
|
||||
OPT_CMDMODE(0, "add-exec-commands", &command,
|
||||
N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
|
||||
{ OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
|
||||
PARSE_OPT_NONEG, parse_opt_commit, 0 },
|
||||
{ OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
|
||||
N_("restrict-revision"), N_("restrict revision"),
|
||||
PARSE_OPT_NONEG, parse_opt_commit, 0 },
|
||||
{ OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
|
||||
N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
|
||||
{ OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
|
||||
N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
|
||||
0 },
|
||||
OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
|
||||
{ OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
|
||||
N_("GPG-sign commits"),
|
||||
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
|
||||
OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
|
||||
N_("rebase strategy")),
|
||||
OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
|
||||
N_("strategy options")),
|
||||
OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
|
||||
N_("the branch or commit to checkout")),
|
||||
OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
|
||||
OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
|
||||
OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
|
||||
OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
|
||||
N_("automatically re-schedule any `exec` that fails")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
opts.rebase_cousins = -1;
|
||||
|
||||
if (argc == 1)
|
||||
usage_with_options(builtin_rebase_interactive_usage, options);
|
||||
|
||||
argc = parse_options(argc, argv, prefix, options,
|
||||
builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
|
||||
|
||||
prepare_repo_settings(the_repository);
|
||||
the_repository->settings.command_requires_full_index = 0;
|
||||
|
||||
if (!is_null_oid(&squash_onto))
|
||||
opts.squash_onto = &squash_onto;
|
||||
|
||||
if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
|
||||
warning(_("--[no-]rebase-cousins has no effect without "
|
||||
"--rebase-merges"));
|
||||
|
||||
return !!run_sequencer_rebase(&opts, command);
|
||||
}
|
||||
|
||||
static int is_merge(struct rebase_options *opts)
|
||||
{
|
||||
return opts->type == REBASE_MERGE ||
|
||||
opts->type == REBASE_PRESERVE_MERGES;
|
||||
return opts->type == REBASE_MERGE;
|
||||
}
|
||||
|
||||
static void imply_merge(struct rebase_options *opts, const char *option)
|
||||
@ -586,7 +390,6 @@ static void imply_merge(struct rebase_options *opts, const char *option)
|
||||
die(_("%s requires the merge backend"), option);
|
||||
break;
|
||||
case REBASE_MERGE:
|
||||
case REBASE_PRESERVE_MERGES:
|
||||
break;
|
||||
default:
|
||||
opts->type = REBASE_MERGE; /* implied */
|
||||
@ -765,17 +568,6 @@ static int finish_rebase(struct rebase_options *opts)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void add_var(struct strbuf *buf, const char *name, const char *value)
|
||||
{
|
||||
if (!value)
|
||||
strbuf_addf(buf, "unset %s; ", name);
|
||||
else {
|
||||
strbuf_addf(buf, "%s=", name);
|
||||
sq_quote_buf(buf, value);
|
||||
strbuf_addstr(buf, "; ");
|
||||
}
|
||||
}
|
||||
|
||||
static int move_to_original_branch(struct rebase_options *opts)
|
||||
{
|
||||
struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
|
||||
@ -932,10 +724,7 @@ static int run_am(struct rebase_options *opts)
|
||||
|
||||
static int run_specific_rebase(struct rebase_options *opts, enum action action)
|
||||
{
|
||||
const char *argv[] = { NULL, NULL };
|
||||
struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
|
||||
int status;
|
||||
const char *backend, *backend_func;
|
||||
|
||||
if (opts->type == REBASE_MERGE) {
|
||||
/* Run sequencer-based rebase */
|
||||
@ -952,87 +741,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
|
||||
}
|
||||
|
||||
status = run_sequencer_rebase(opts, action);
|
||||
goto finished_rebase;
|
||||
}
|
||||
|
||||
if (opts->type == REBASE_APPLY) {
|
||||
} else if (opts->type == REBASE_APPLY)
|
||||
status = run_am(opts);
|
||||
goto finished_rebase;
|
||||
}
|
||||
|
||||
add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
|
||||
add_var(&script_snippet, "state_dir", opts->state_dir);
|
||||
|
||||
add_var(&script_snippet, "upstream_name", opts->upstream_name);
|
||||
add_var(&script_snippet, "upstream", opts->upstream ?
|
||||
oid_to_hex(&opts->upstream->object.oid) : NULL);
|
||||
add_var(&script_snippet, "head_name",
|
||||
opts->head_name ? opts->head_name : "detached HEAD");
|
||||
add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
|
||||
add_var(&script_snippet, "onto", opts->onto ?
|
||||
oid_to_hex(&opts->onto->object.oid) : NULL);
|
||||
add_var(&script_snippet, "onto_name", opts->onto_name);
|
||||
add_var(&script_snippet, "revisions", opts->revisions);
|
||||
add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
|
||||
oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
|
||||
sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
|
||||
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",
|
||||
opts->flags & REBASE_DIFFSTAT ? "t" : "");
|
||||
add_var(&script_snippet, "force_rebase",
|
||||
opts->flags & REBASE_FORCE ? "t" : "");
|
||||
if (opts->switch_to)
|
||||
add_var(&script_snippet, "switch_to", opts->switch_to);
|
||||
add_var(&script_snippet, "action", opts->action ? opts->action : "");
|
||||
add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
|
||||
add_var(&script_snippet, "allow_rerere_autoupdate",
|
||||
opts->allow_rerere_autoupdate ?
|
||||
opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
|
||||
"--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
|
||||
add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
|
||||
add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
|
||||
add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
|
||||
add_var(&script_snippet, "cmd", opts->cmd);
|
||||
add_var(&script_snippet, "allow_empty_message",
|
||||
opts->allow_empty_message ? "--allow-empty-message" : "");
|
||||
add_var(&script_snippet, "rebase_merges",
|
||||
opts->rebase_merges ? "t" : "");
|
||||
add_var(&script_snippet, "rebase_cousins",
|
||||
opts->rebase_cousins ? "t" : "");
|
||||
add_var(&script_snippet, "strategy", opts->strategy);
|
||||
add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
|
||||
add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
|
||||
add_var(&script_snippet, "squash_onto",
|
||||
opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
|
||||
add_var(&script_snippet, "git_format_patch_opt",
|
||||
opts->git_format_patch_opt.buf);
|
||||
|
||||
if (is_merge(opts) &&
|
||||
!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
|
||||
strbuf_addstr(&script_snippet,
|
||||
"GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
|
||||
opts->autosquash = 0;
|
||||
}
|
||||
|
||||
switch (opts->type) {
|
||||
case REBASE_PRESERVE_MERGES:
|
||||
backend = "git-rebase--preserve-merges";
|
||||
backend_func = "git_rebase__preserve_merges";
|
||||
break;
|
||||
default:
|
||||
else
|
||||
BUG("Unhandled rebase type %d", opts->type);
|
||||
break;
|
||||
}
|
||||
|
||||
strbuf_addf(&script_snippet,
|
||||
". git-sh-setup && . %s && %s", backend, backend_func);
|
||||
argv[0] = script_snippet.buf;
|
||||
|
||||
status = run_command_v_opt(argv, RUN_USING_SHELL);
|
||||
finished_rebase:
|
||||
if (opts->dont_finish_rebase)
|
||||
; /* do nothing */
|
||||
else if (opts->type == REBASE_MERGE)
|
||||
@ -1050,8 +763,6 @@ finished_rebase:
|
||||
die("Nothing to do");
|
||||
}
|
||||
|
||||
strbuf_release(&script_snippet);
|
||||
|
||||
return status ? -1 : 0;
|
||||
}
|
||||
|
||||
@ -1187,7 +898,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* -i followed by -p is still explicitly interactive, but -p alone is not */
|
||||
/* -i followed by -r is still explicitly interactive, but -r alone is not */
|
||||
static int parse_opt_interactive(const struct option *opt, const char *arg,
|
||||
int unset)
|
||||
{
|
||||
@ -1305,6 +1016,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
char *squash_onto_name = NULL;
|
||||
int reschedule_failed_exec = -1;
|
||||
int allow_preemptive_ff = 1;
|
||||
int preserve_merges_selected = 0;
|
||||
struct option builtin_rebase_options[] = {
|
||||
OPT_STRING(0, "onto", &options.onto_name,
|
||||
N_("revision"),
|
||||
@ -1369,10 +1081,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
N_("let the user edit the list of commits to rebase"),
|
||||
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
|
||||
parse_opt_interactive),
|
||||
OPT_SET_INT_F('p', "preserve-merges", &options.type,
|
||||
OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
|
||||
N_("(DEPRECATED) try to recreate merges instead of "
|
||||
"ignoring them"),
|
||||
REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
|
||||
1, PARSE_OPT_HIDDEN),
|
||||
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
|
||||
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
|
||||
N_("how to handle commits that become empty"),
|
||||
@ -1443,8 +1155,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
strbuf_reset(&buf);
|
||||
strbuf_addf(&buf, "%s/rewritten", merge_dir());
|
||||
if (is_directory(buf.buf)) {
|
||||
options.type = REBASE_PRESERVE_MERGES;
|
||||
options.flags |= REBASE_INTERACTIVE_EXPLICIT;
|
||||
die("`rebase -p` is no longer supported");
|
||||
} else {
|
||||
strbuf_reset(&buf);
|
||||
strbuf_addf(&buf, "%s/interactive", merge_dir());
|
||||
@ -1465,6 +1176,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
builtin_rebase_options,
|
||||
builtin_rebase_usage, 0);
|
||||
|
||||
if (preserve_merges_selected)
|
||||
die(_("--preserve-merges was replaced by --rebase-merges"));
|
||||
|
||||
if (action != ACTION_NONE && total_argc != 2) {
|
||||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
@ -1474,10 +1188,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
if (options.type == REBASE_PRESERVE_MERGES)
|
||||
warning(_("git rebase --preserve-merges is deprecated. "
|
||||
"Use --rebase-merges instead."));
|
||||
|
||||
if (keep_base) {
|
||||
if (options.onto_name)
|
||||
die(_("cannot combine '--keep-base' with '--onto'"));
|
||||
@ -1697,7 +1407,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
if (options.ignore_date)
|
||||
strvec_push(&options.git_am_opts, "--ignore-date");
|
||||
} else {
|
||||
/* REBASE_MERGE and PRESERVE_MERGES */
|
||||
/* REBASE_MERGE */
|
||||
if (ignore_whitespace) {
|
||||
string_list_append(&strategy_options,
|
||||
"ignore-space-change");
|
||||
@ -1723,7 +1433,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
case REBASE_APPLY:
|
||||
die(_("--strategy requires --merge or --interactive"));
|
||||
case REBASE_MERGE:
|
||||
case REBASE_PRESERVE_MERGES:
|
||||
/* compatible */
|
||||
break;
|
||||
case REBASE_UNSPECIFIED:
|
||||
@ -1775,7 +1484,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
|
||||
switch (options.type) {
|
||||
case REBASE_MERGE:
|
||||
case REBASE_PRESERVE_MERGES:
|
||||
options.state_dir = merge_dir();
|
||||
break;
|
||||
case REBASE_APPLY:
|
||||
@ -1800,28 +1508,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
options.reschedule_failed_exec = reschedule_failed_exec;
|
||||
|
||||
if (options.signoff) {
|
||||
if (options.type == REBASE_PRESERVE_MERGES)
|
||||
die("cannot combine '--signoff' with "
|
||||
"'--preserve-merges'");
|
||||
strvec_push(&options.git_am_opts, "--signoff");
|
||||
options.flags |= REBASE_FORCE;
|
||||
}
|
||||
|
||||
if (options.type == REBASE_PRESERVE_MERGES) {
|
||||
/*
|
||||
* Note: incompatibility with --signoff handled in signoff block above
|
||||
* Note: incompatibility with --interactive is just a strong warning;
|
||||
* git-rebase.txt caveats with "unless you know what you are doing"
|
||||
*/
|
||||
if (options.rebase_merges)
|
||||
die(_("cannot combine '--preserve-merges' with "
|
||||
"'--rebase-merges'"));
|
||||
|
||||
if (options.reschedule_failed_exec)
|
||||
die(_("error: cannot combine '--preserve-merges' with "
|
||||
"'--reschedule-failed-exec'"));
|
||||
}
|
||||
|
||||
if (!options.root) {
|
||||
if (argc < 1) {
|
||||
struct branch *branch;
|
||||
|
||||
@ -318,6 +318,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
|
||||
* truth value with >= REBASE_TRUE.
|
||||
*/
|
||||
info->rebase = rebase_parse_value(value);
|
||||
if (info->rebase == REBASE_INVALID)
|
||||
warning(_("unhandled branch.%s.rebase=%s; assuming "
|
||||
"'true'"), name, value);
|
||||
break;
|
||||
case PUSH_REMOTE:
|
||||
if (info->push_remote_name)
|
||||
|
||||
@ -2550,7 +2550,7 @@ __git_complete_config_variable_value ()
|
||||
return
|
||||
;;
|
||||
branch.*.rebase)
|
||||
__gitcomp "false true merges preserve interactive" "" "$cur_"
|
||||
__gitcomp "false true merges interactive" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
remote.pushdefault)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -273,7 +273,6 @@ my %cmd = (
|
||||
'fetch-all|all' => \$_fetch_all,
|
||||
'dry-run|n' => \$_dry_run,
|
||||
'rebase-merges|p' => \$_rebase_merges,
|
||||
'preserve-merges|p' => \$_rebase_merges,
|
||||
%fc_opts } ],
|
||||
'commit-diff' => [ \&cmd_commit_diff,
|
||||
'Commit a diff between two trees',
|
||||
|
||||
1
git.c
1
git.c
@ -577,7 +577,6 @@ static struct cmd_struct commands[] = {
|
||||
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
|
||||
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
|
||||
{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "receive-pack", cmd_receive_pack },
|
||||
{ "reflog", cmd_reflog, RUN_SETUP },
|
||||
{ "remote", cmd_remote, RUN_SETUP },
|
||||
|
||||
@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_
|
||||
todo_list_release(&backup);
|
||||
return res;
|
||||
}
|
||||
|
||||
int check_todo_list_from_file(struct repository *r)
|
||||
{
|
||||
struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
|
||||
int res = 0;
|
||||
|
||||
if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
|
||||
res = error(_("could not read '%s'."), rebase_path_todo());
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
|
||||
res = error(_("could not read '%s'."), rebase_path_todo_backup());
|
||||
goto out;
|
||||
}
|
||||
|
||||
res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
|
||||
if (!res)
|
||||
res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
|
||||
if (res)
|
||||
fprintf(stderr, _(edit_todo_list_advice));
|
||||
if (!res)
|
||||
res = todo_list_check(&old_todo, &new_todo);
|
||||
out:
|
||||
todo_list_release(&old_todo);
|
||||
todo_list_release(&new_todo);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
|
||||
int todo_list_check_against_backup(struct repository *r,
|
||||
struct todo_list *todo_list);
|
||||
|
||||
int check_todo_list_from_file(struct repository *r);
|
||||
|
||||
#endif
|
||||
|
||||
5
rebase.c
5
rebase.c
@ -1,5 +1,6 @@
|
||||
#include "rebase.h"
|
||||
#include "config.h"
|
||||
#include "gettext.h"
|
||||
|
||||
/*
|
||||
* Parses textual value for pull.rebase, branch.<name>.rebase, etc.
|
||||
@ -20,12 +21,12 @@ enum rebase_type rebase_parse_value(const char *value)
|
||||
return REBASE_FALSE;
|
||||
else if (v > 0)
|
||||
return REBASE_TRUE;
|
||||
else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
|
||||
return REBASE_PRESERVE;
|
||||
else if (!strcmp(value, "merges") || !strcmp(value, "m"))
|
||||
return REBASE_MERGES;
|
||||
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
|
||||
return REBASE_INTERACTIVE;
|
||||
else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
|
||||
error(_("%s: 'preserve' superseded by 'merges'"), value);
|
||||
/*
|
||||
* Please update _git_config() in git-completion.bash when you
|
||||
* add new rebase modes.
|
||||
|
||||
1
rebase.h
1
rebase.h
@ -5,7 +5,6 @@ enum rebase_type {
|
||||
REBASE_INVALID = -1,
|
||||
REBASE_FALSE = 0,
|
||||
REBASE_TRUE,
|
||||
REBASE_PRESERVE,
|
||||
REBASE_MERGES,
|
||||
REBASE_INTERACTIVE
|
||||
};
|
||||
|
||||
@ -5446,8 +5446,8 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
|
||||
* Add commands after pick and (series of) squash/fixup commands
|
||||
* in the todo list.
|
||||
*/
|
||||
void todo_list_add_exec_commands(struct todo_list *todo_list,
|
||||
struct string_list *commands)
|
||||
static void todo_list_add_exec_commands(struct todo_list *todo_list,
|
||||
struct string_list *commands)
|
||||
{
|
||||
struct strbuf *buf = &todo_list->buf;
|
||||
size_t base_offset = buf->len;
|
||||
|
||||
@ -162,8 +162,6 @@ int sequencer_remove_state(struct replay_opts *opts);
|
||||
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
|
||||
const char **argv, unsigned flags);
|
||||
|
||||
void todo_list_add_exec_commands(struct todo_list *todo_list,
|
||||
struct string_list *commands);
|
||||
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
|
||||
const char *shortrevisions, const char *onto_name,
|
||||
struct commit *onto, const struct object_id *orig_head,
|
||||
|
||||
@ -352,82 +352,6 @@ test_expect_success 'retain authorship when squashing' '
|
||||
git show HEAD | grep "^Author: Twerp Snog"
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P '-p handles "no changes" gracefully' '
|
||||
HEAD=$(git rev-parse HEAD) &&
|
||||
git rebase -i -p HEAD^ &&
|
||||
git update-index --refresh &&
|
||||
git diff-files --quiet &&
|
||||
git diff-index --quiet --cached HEAD -- &&
|
||||
test $HEAD = $(git rev-parse HEAD)
|
||||
'
|
||||
|
||||
test_expect_failure REBASE_P 'exchange two commits with -p' '
|
||||
git checkout H &&
|
||||
(
|
||||
set_fake_editor &&
|
||||
FAKE_LINES="2 1" git rebase -i -p HEAD~2
|
||||
) &&
|
||||
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
|
||||
test G = $(git cat-file commit HEAD | sed -ne \$p)
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'preserve merges with -p' '
|
||||
git checkout -b to-be-preserved primary^ &&
|
||||
: > unrelated-file &&
|
||||
git add unrelated-file &&
|
||||
test_tick &&
|
||||
git commit -m "unrelated" &&
|
||||
git checkout -b another-branch primary &&
|
||||
echo B > file1 &&
|
||||
test_tick &&
|
||||
git commit -m J file1 &&
|
||||
test_tick &&
|
||||
git merge to-be-preserved &&
|
||||
echo C > file1 &&
|
||||
test_tick &&
|
||||
git commit -m K file1 &&
|
||||
echo D > file1 &&
|
||||
test_tick &&
|
||||
git commit -m L1 file1 &&
|
||||
git checkout HEAD^ &&
|
||||
echo 1 > unrelated-file &&
|
||||
test_tick &&
|
||||
git commit -m L2 unrelated-file &&
|
||||
test_tick &&
|
||||
git merge another-branch &&
|
||||
echo E > file1 &&
|
||||
test_tick &&
|
||||
git commit -m M file1 &&
|
||||
git checkout -b to-be-rebased &&
|
||||
test_tick &&
|
||||
git rebase -i -p --onto branch1 primary &&
|
||||
git update-index --refresh &&
|
||||
git diff-files --quiet &&
|
||||
git diff-index --quiet --cached HEAD -- &&
|
||||
test_cmp_rev HEAD~6 branch1 &&
|
||||
test_cmp_rev HEAD~4^2 to-be-preserved &&
|
||||
test_cmp_rev HEAD^^2^ HEAD^^^ &&
|
||||
test $(git show HEAD~5:file1) = B &&
|
||||
test $(git show HEAD~3:file1) = C &&
|
||||
test $(git show HEAD:file1) = E &&
|
||||
test $(git show HEAD:unrelated-file) = 1
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'edit ancestor with -p' '
|
||||
(
|
||||
set_fake_editor &&
|
||||
FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
|
||||
) &&
|
||||
echo 2 > unrelated-file &&
|
||||
test_tick &&
|
||||
git commit -m L2-modified --amend unrelated-file &&
|
||||
git rebase --continue &&
|
||||
git update-index --refresh &&
|
||||
git diff-files --quiet &&
|
||||
git diff-index --quiet --cached HEAD -- &&
|
||||
test $(git show HEAD:unrelated-file) = 2
|
||||
'
|
||||
|
||||
test_expect_success '--continue tries to commit' '
|
||||
git reset --hard D &&
|
||||
test_tick &&
|
||||
|
||||
@ -55,14 +55,4 @@ test_expect_success rebase '
|
||||
test_cmp expect actual
|
||||
|
||||
'
|
||||
test_expect_success REBASE_P rebasep '
|
||||
|
||||
git checkout side-merge &&
|
||||
git rebase -p side &&
|
||||
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
|
||||
git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
|
||||
test_cmp expect actual
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -1,130 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright(C) 2008 Stephen Habermann & Andreas Ericsson
|
||||
#
|
||||
test_description='git rebase -p should preserve merges
|
||||
|
||||
Run "git rebase -p" and check that merges are properly carried along
|
||||
'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq REBASE_P; then
|
||||
skip_all='skipping git rebase -p tests, as asked for'
|
||||
test_done
|
||||
fi
|
||||
|
||||
GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
export GIT_AUTHOR_EMAIL
|
||||
|
||||
# Clone 2 (conflicting merge):
|
||||
#
|
||||
# A1--A2--B3 <-- origin/main
|
||||
# \ \
|
||||
# B1------M <-- topic
|
||||
# \
|
||||
# B2 <-- origin/topic
|
||||
#
|
||||
# Clone 3 (no-ff merge):
|
||||
#
|
||||
# A1--A2--B3 <-- origin/main
|
||||
# \
|
||||
# B1------M <-- topic
|
||||
# \ /
|
||||
# \--A3 <-- topic2
|
||||
# \
|
||||
# B2 <-- origin/topic
|
||||
#
|
||||
# Clone 4 (same as Clone 3)
|
||||
|
||||
test_expect_success 'setup for merge-preserving rebase' \
|
||||
'echo First > A &&
|
||||
git add A &&
|
||||
git commit -m "Add A1" &&
|
||||
git checkout -b topic &&
|
||||
echo Second > B &&
|
||||
git add B &&
|
||||
git commit -m "Add B1" &&
|
||||
git checkout -f main &&
|
||||
echo Third >> A &&
|
||||
git commit -a -m "Modify A2" &&
|
||||
echo Fifth > B &&
|
||||
git add B &&
|
||||
git commit -m "Add different B" &&
|
||||
|
||||
git clone ./. clone2 &&
|
||||
(
|
||||
cd clone2 &&
|
||||
git checkout -b topic origin/topic &&
|
||||
test_must_fail git merge origin/main &&
|
||||
echo Resolved >B &&
|
||||
git add B &&
|
||||
git commit -m "Merge origin/main into topic"
|
||||
) &&
|
||||
|
||||
git clone ./. clone3 &&
|
||||
(
|
||||
cd clone3 &&
|
||||
git checkout -b topic2 origin/topic &&
|
||||
echo Sixth > A &&
|
||||
git commit -a -m "Modify A3" &&
|
||||
git checkout -b topic origin/topic &&
|
||||
git merge --no-ff topic2
|
||||
) &&
|
||||
|
||||
git clone ./. clone4 &&
|
||||
(
|
||||
cd clone4 &&
|
||||
git checkout -b topic2 origin/topic &&
|
||||
echo Sixth > A &&
|
||||
git commit -a -m "Modify A3" &&
|
||||
git checkout -b topic origin/topic &&
|
||||
git merge --no-ff topic2
|
||||
) &&
|
||||
|
||||
git checkout topic &&
|
||||
echo Fourth >> B &&
|
||||
git commit -a -m "Modify B2"
|
||||
'
|
||||
|
||||
test_expect_success '--continue works after a conflict' '
|
||||
(
|
||||
cd clone2 &&
|
||||
git fetch &&
|
||||
test_must_fail git rebase -p origin/topic &&
|
||||
test 2 = $(git ls-files B | wc -l) &&
|
||||
echo Resolved again > B &&
|
||||
test_must_fail git rebase --continue &&
|
||||
grep "^@@@ " .git/rebase-merge/patch &&
|
||||
git add B &&
|
||||
git rebase --continue &&
|
||||
test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
|
||||
test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
|
||||
test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rebase -p preserves no-ff merges' '
|
||||
(
|
||||
cd clone3 &&
|
||||
git fetch &&
|
||||
git rebase -p origin/topic &&
|
||||
test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
|
||||
test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rebase -p ignores merge.log config' '
|
||||
(
|
||||
cd clone4 &&
|
||||
git fetch &&
|
||||
git -c merge.log=1 rebase -p origin/topic &&
|
||||
echo >expected &&
|
||||
git log --format="%b" -1 >current &&
|
||||
test_cmp expected current
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -1,90 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2008 Stephen Haberman
|
||||
#
|
||||
|
||||
test_description='git rebase preserve merges
|
||||
|
||||
This test runs git rebase with preserve merges and ensures commits
|
||||
dropped by the --cherry-pick flag have their childrens parents
|
||||
rewritten.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq REBASE_P; then
|
||||
skip_all='skipping git rebase -p tests, as asked for'
|
||||
test_done
|
||||
fi
|
||||
|
||||
# set up two branches like this:
|
||||
#
|
||||
# A - B - C - D - E
|
||||
# \
|
||||
# F - G - H
|
||||
# \
|
||||
# I
|
||||
#
|
||||
# where B, D and G touch the same file.
|
||||
|
||||
test_expect_success 'setup' '
|
||||
test_commit A file1 &&
|
||||
test_commit B file1 1 &&
|
||||
test_commit C file2 &&
|
||||
test_commit D file1 2 &&
|
||||
test_commit E file3 &&
|
||||
git checkout A &&
|
||||
test_commit F file4 &&
|
||||
test_commit G file1 3 &&
|
||||
test_commit H file5 &&
|
||||
git checkout F &&
|
||||
test_commit I file6
|
||||
'
|
||||
|
||||
# A - B - C - D - E
|
||||
# \ \ \
|
||||
# F - G - H -- L \ --> L
|
||||
# \ | \
|
||||
# I -- G2 -- J -- K I -- K
|
||||
# G2 = same changes as G
|
||||
test_expect_success 'skip same-resolution merges with -p' '
|
||||
git checkout H &&
|
||||
test_must_fail git merge E &&
|
||||
test_commit L file1 23 &&
|
||||
git checkout I &&
|
||||
test_commit G2 file1 3 &&
|
||||
test_must_fail git merge E &&
|
||||
test_commit J file1 23 &&
|
||||
test_commit K file7 file7 &&
|
||||
git rebase -i -p L &&
|
||||
test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
|
||||
test "23" = "$(cat file1)" &&
|
||||
test "I" = "$(cat file6)" &&
|
||||
test "file7" = "$(cat file7)"
|
||||
'
|
||||
|
||||
# A - B - C - D - E
|
||||
# \ \ \
|
||||
# F - G - H -- L2 \ --> L2
|
||||
# \ | \
|
||||
# I -- G3 --- J2 -- K2 I -- G3 -- K2
|
||||
# G2 = different changes as G
|
||||
test_expect_success 'keep different-resolution merges with -p' '
|
||||
git checkout H &&
|
||||
test_must_fail git merge E &&
|
||||
test_commit L2 file1 23 &&
|
||||
git checkout I &&
|
||||
test_commit G3 file1 4 &&
|
||||
test_must_fail git merge E &&
|
||||
test_commit J2 file1 24 &&
|
||||
test_commit K2 file7 file7 &&
|
||||
test_must_fail git rebase -i -p L2 &&
|
||||
echo 234 > file1 &&
|
||||
git add file1 &&
|
||||
git rebase --continue &&
|
||||
test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
|
||||
test "234" = "$(cat file1)" &&
|
||||
test "I" = "$(cat file6)" &&
|
||||
test "file7" = "$(cat file7)"
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -1,80 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2008 Stephen Haberman
|
||||
#
|
||||
|
||||
test_description='git rebase preserve merges
|
||||
|
||||
This test runs git rebase with -p and tries to squash a commit from after
|
||||
a merge to before the merge.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq REBASE_P; then
|
||||
skip_all='skipping git rebase -p tests, as asked for'
|
||||
test_done
|
||||
fi
|
||||
|
||||
. "$TEST_DIRECTORY"/lib-rebase.sh
|
||||
|
||||
set_fake_editor
|
||||
|
||||
# set up two branches like this:
|
||||
#
|
||||
# A1 - B1 - D1 - E1 - F1
|
||||
# \ /
|
||||
# -- C1 --
|
||||
|
||||
test_expect_success 'setup' '
|
||||
test_commit A1 &&
|
||||
test_commit B1 &&
|
||||
test_commit C1 &&
|
||||
git reset --hard B1 &&
|
||||
test_commit D1 &&
|
||||
test_merge E1 C1 &&
|
||||
test_commit F1
|
||||
'
|
||||
|
||||
# Should result in:
|
||||
#
|
||||
# A1 - B1 - D2 - E2
|
||||
# \ /
|
||||
# -- C1 --
|
||||
#
|
||||
test_expect_success 'squash F1 into D1' '
|
||||
FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
|
||||
test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
|
||||
test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
|
||||
git tag E2
|
||||
'
|
||||
|
||||
# Start with:
|
||||
#
|
||||
# A1 - B1 - D2 - E2
|
||||
# \
|
||||
# G1 ---- L1 ---- M1
|
||||
# \ /
|
||||
# H1 -- J1 -- K1
|
||||
# \ /
|
||||
# -- I1 --
|
||||
#
|
||||
# And rebase G1..M1 onto E2
|
||||
|
||||
test_expect_success 'rebase two levels of merge' '
|
||||
git checkout A1 &&
|
||||
test_commit G1 &&
|
||||
test_commit H1 &&
|
||||
test_commit I1 &&
|
||||
git checkout -b branch3 H1 &&
|
||||
test_commit J1 &&
|
||||
test_merge K1 I1 &&
|
||||
git checkout -b branch2 G1 &&
|
||||
test_commit L1 &&
|
||||
test_merge M1 K1 &&
|
||||
GIT_EDITOR=: git rebase -i -p E2 &&
|
||||
test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
|
||||
test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
|
||||
test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -89,17 +89,6 @@ test_expect_success 'pre-rebase got correct input (4)' '
|
||||
test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'rebase -i -p with linear history' '
|
||||
git checkout -b work5 other &&
|
||||
git rebase -i -p --root --onto main &&
|
||||
git log --pretty=tformat:"%s" > rebased5 &&
|
||||
test_cmp expect rebased5
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'pre-rebase got correct input (5)' '
|
||||
test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
|
||||
'
|
||||
|
||||
test_expect_success 'set up merge history' '
|
||||
git checkout other^ &&
|
||||
git checkout -b side &&
|
||||
@ -123,13 +112,6 @@ commit work6~4
|
||||
1
|
||||
EOF
|
||||
|
||||
test_expect_success REBASE_P 'rebase -i -p with merge' '
|
||||
git checkout -b work6 other &&
|
||||
git rebase -i -p --root --onto main &&
|
||||
log_with_names work6 > rebased6 &&
|
||||
test_cmp expect-side rebased6
|
||||
'
|
||||
|
||||
test_expect_success 'set up second root and merge' '
|
||||
git symbolic-ref HEAD refs/heads/third &&
|
||||
rm .git/index &&
|
||||
@ -158,13 +140,6 @@ commit work7~5
|
||||
1
|
||||
EOF
|
||||
|
||||
test_expect_success REBASE_P 'rebase -i -p with two roots' '
|
||||
git checkout -b work7 other &&
|
||||
git rebase -i -p --root --onto main &&
|
||||
log_with_names work7 > rebased7 &&
|
||||
test_cmp expect-third rebased7
|
||||
'
|
||||
|
||||
test_expect_success 'setup pre-rebase hook that fails' '
|
||||
mkdir -p .git/hooks &&
|
||||
cat >.git/hooks/pre-rebase <<EOF &&
|
||||
@ -264,21 +239,9 @@ commit conflict3~6
|
||||
1
|
||||
EOF
|
||||
|
||||
test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' '
|
||||
git checkout -b conflict3 other &&
|
||||
test_must_fail git rebase -i -p --root --onto main &&
|
||||
git ls-files -u | grep "B$"
|
||||
'
|
||||
|
||||
test_expect_success 'fix the conflict' '
|
||||
echo 3 > B &&
|
||||
git add B
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'rebase -i -p --root with conflict (second part)' '
|
||||
git rebase --continue &&
|
||||
log_with_names conflict3 >out &&
|
||||
test_cmp expect-conflict-p out
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2009 Greg Price
|
||||
#
|
||||
|
||||
test_description='git rebase -p should respect --onto
|
||||
|
||||
In a rebase with --onto, we should rewrite all the commits that
|
||||
aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq REBASE_P; then
|
||||
skip_all='skipping git rebase -p tests, as asked for'
|
||||
test_done
|
||||
fi
|
||||
|
||||
. "$TEST_DIRECTORY"/lib-rebase.sh
|
||||
|
||||
# Set up branches like this:
|
||||
# A1---B1---E1---F1---G1
|
||||
# \ \ /
|
||||
# \ \--C1---D1--/
|
||||
# H1
|
||||
|
||||
test_expect_success 'setup' '
|
||||
test_commit A1 &&
|
||||
test_commit B1 &&
|
||||
test_commit C1 &&
|
||||
test_commit D1 &&
|
||||
git reset --hard B1 &&
|
||||
test_commit E1 &&
|
||||
test_commit F1 &&
|
||||
test_merge G1 D1 &&
|
||||
git reset --hard A1 &&
|
||||
test_commit H1
|
||||
'
|
||||
|
||||
# Now rebase merge G1 from both branches' base B1, both should move:
|
||||
# A1---B1---E1---F1---G1
|
||||
# \ \ /
|
||||
# \ \--C1---D1--/
|
||||
# \
|
||||
# H1---E2---F2---G2
|
||||
# \ /
|
||||
# \--C2---D2--/
|
||||
|
||||
test_expect_success 'rebase from B1 onto H1' '
|
||||
git checkout G1 &&
|
||||
git rebase -p --onto H1 B1 &&
|
||||
test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
|
||||
test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
|
||||
'
|
||||
|
||||
# On the other hand if rebase from E1 which is within one branch,
|
||||
# then the other branch stays:
|
||||
# A1---B1---E1---F1---G1
|
||||
# \ \ /
|
||||
# \ \--C1---D1--/
|
||||
# \ \
|
||||
# H1-----F3-----G3
|
||||
|
||||
test_expect_success 'rebase from E1 onto H1' '
|
||||
git checkout G1 &&
|
||||
git rebase -p --onto H1 E1 &&
|
||||
test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
|
||||
test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
|
||||
'
|
||||
|
||||
# And the same if we rebase from a commit in the second-parent branch.
|
||||
# A1---B1---E1---F1----G1
|
||||
# \ \ \ /
|
||||
# \ \--C1---D1-\-/
|
||||
# \ \
|
||||
# H1------D3------G4
|
||||
|
||||
test_expect_success 'rebase from C1 onto H1' '
|
||||
git checkout G1 &&
|
||||
git rev-list --first-parent --pretty=oneline C1..G1 &&
|
||||
git rebase -p --onto H1 C1 &&
|
||||
test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
|
||||
test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -119,20 +119,6 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' '
|
||||
test -f funny.was.run
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
|
||||
rm -fr .git/rebase-* &&
|
||||
git reset --hard commit-new-file-F3-on-topic-branch &&
|
||||
test_commit theirs-to-merge &&
|
||||
git reset --hard HEAD^ &&
|
||||
test_commit some-commit &&
|
||||
test_tick &&
|
||||
git merge --no-ff theirs-to-merge &&
|
||||
FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \
|
||||
-s recursive --strategy-option=theirs HEAD~2 &&
|
||||
test_commit force-change &&
|
||||
git rebase --continue
|
||||
'
|
||||
|
||||
test_expect_success 'rebase -r passes merge strategy options correctly' '
|
||||
rm -fr .git/rebase-* &&
|
||||
git reset --hard commit-new-file-F3-on-topic-branch &&
|
||||
@ -268,7 +254,6 @@ test_rerere_autoupdate --apply
|
||||
test_rerere_autoupdate -m
|
||||
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
|
||||
test_rerere_autoupdate -i
|
||||
test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
|
||||
unset GIT_SEQUENCE_EDITOR
|
||||
|
||||
test_expect_success 'the todo command "break" works' '
|
||||
|
||||
@ -29,7 +29,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_expect_success 'setup branches and remote tracking' '
|
||||
git tag -l >tags &&
|
||||
@ -53,7 +52,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -70,7 +68,6 @@ test_run_rebase success --apply
|
||||
test_run_rebase success --fork-point
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -87,7 +84,6 @@ test_run_rebase success --apply
|
||||
test_run_rebase success --fork-point
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -102,7 +98,6 @@ test_run_rebase success --apply
|
||||
test_run_rebase success --fork-point
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
# f
|
||||
# /
|
||||
@ -142,7 +137,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -157,7 +151,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -172,7 +165,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -187,7 +179,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
# a---b---c---j!
|
||||
# \
|
||||
@ -215,7 +206,6 @@ test_run_rebase () {
|
||||
test_run_rebase failure --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -229,7 +219,6 @@ test_run_rebase () {
|
||||
}
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -243,7 +232,6 @@ test_run_rebase () {
|
||||
}
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
test_run_rebase success --rebase-merges
|
||||
|
||||
# m
|
||||
@ -283,7 +271,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -298,7 +285,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -313,7 +299,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -329,7 +314,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -344,7 +328,6 @@ test_run_rebase () {
|
||||
test_run_rebase success --apply
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -358,7 +341,6 @@ test_run_rebase () {
|
||||
test_run_rebase success ''
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase failure -p
|
||||
|
||||
test_run_rebase () {
|
||||
result=$1
|
||||
@ -373,6 +355,5 @@ test_run_rebase () {
|
||||
test_run_rebase success ''
|
||||
test_run_rebase success -m
|
||||
test_run_rebase success -i
|
||||
test_have_prereq !REBASE_P || test_run_rebase success -p
|
||||
|
||||
test_done
|
||||
|
||||
@ -63,15 +63,4 @@ test_rebase_am_only () {
|
||||
test_rebase_am_only --whitespace=fix
|
||||
test_rebase_am_only -C4
|
||||
|
||||
test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase --preserve-merges --signoff A
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P \
|
||||
'--preserve-merges incompatible with --rebase-merges' '
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase --preserve-merges --rebase-merges A
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -106,155 +106,4 @@ test_run_rebase success 'd n o e' --apply
|
||||
test_run_rebase success 'd n o e' -m
|
||||
test_run_rebase success 'd n o e' -i
|
||||
|
||||
if ! test_have_prereq REBASE_P; then
|
||||
skip_all='skipping git rebase -p tests, as asked for'
|
||||
test_done
|
||||
fi
|
||||
|
||||
test_expect_success "rebase -p is no-op in non-linear history" "
|
||||
reset_rebase &&
|
||||
git rebase -p d w &&
|
||||
test_cmp_rev w HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p is no-op when base inside second parent" "
|
||||
reset_rebase &&
|
||||
git rebase -p e w &&
|
||||
test_cmp_rev w HEAD
|
||||
"
|
||||
|
||||
test_expect_failure "rebase -p --root on non-linear history is a no-op" "
|
||||
reset_rebase &&
|
||||
git rebase -p --root w &&
|
||||
test_cmp_rev w HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p re-creates merge from side branch" "
|
||||
reset_rebase &&
|
||||
git rebase -p z w &&
|
||||
test_cmp_rev z HEAD^ &&
|
||||
test_cmp_rev w^2 HEAD^2
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p re-creates internal merge" "
|
||||
reset_rebase &&
|
||||
git rebase -p c w &&
|
||||
test_cmp_rev c HEAD~4 &&
|
||||
test_cmp_rev HEAD^2^ HEAD~3 &&
|
||||
test_revision_subjects 'd n e o w' HEAD~3 HEAD~2 HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p can re-create two branches on onto" "
|
||||
reset_rebase &&
|
||||
git rebase -p --onto c d w &&
|
||||
test_cmp_rev c HEAD~3 &&
|
||||
test_cmp_rev c HEAD^2^ &&
|
||||
test_revision_subjects 'n e o w' HEAD~2 HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
# f
|
||||
# /
|
||||
# a---b---c---g---h
|
||||
# \
|
||||
# d---gp--i
|
||||
# \ \
|
||||
# e-------u
|
||||
#
|
||||
# gp = cherry-picked g
|
||||
# h = reverted g
|
||||
test_expect_success 'setup of non-linear-history for patch-equivalence tests' '
|
||||
git checkout e &&
|
||||
test_merge u i
|
||||
'
|
||||
|
||||
test_expect_success "rebase -p re-creates history around dropped commit matching upstream" "
|
||||
reset_rebase &&
|
||||
git rebase -p h u &&
|
||||
test_cmp_rev h HEAD~3 &&
|
||||
test_cmp_rev HEAD^2^ HEAD~2 &&
|
||||
test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p --onto in merged history drops patches in upstream" "
|
||||
reset_rebase &&
|
||||
git rebase -p --onto f h u &&
|
||||
test_cmp_rev f HEAD~3 &&
|
||||
test_cmp_rev HEAD^2^ HEAD~2 &&
|
||||
test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p --onto in merged history does not drop patches in onto" "
|
||||
reset_rebase &&
|
||||
git rebase -p --onto h f u &&
|
||||
test_cmp_rev h HEAD~3 &&
|
||||
test_cmp_rev HEAD^2~2 HEAD~2 &&
|
||||
test_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
# a---b---c---g---h
|
||||
# \
|
||||
# d---gp--s
|
||||
# \ \ /
|
||||
# \ X
|
||||
# \ / \
|
||||
# e---t
|
||||
#
|
||||
# gp = cherry-picked g
|
||||
# h = reverted g
|
||||
test_expect_success 'setup of non-linear-history for dropping whole side' '
|
||||
git checkout gp &&
|
||||
test_merge s e &&
|
||||
git checkout e &&
|
||||
test_merge t gp
|
||||
'
|
||||
|
||||
test_expect_failure "rebase -p drops merge commit when entire first-parent side is dropped" "
|
||||
reset_rebase &&
|
||||
git rebase -p h s &&
|
||||
test_cmp_rev h HEAD~2 &&
|
||||
test_linear_range 'd e' h..
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p drops merge commit when entire second-parent side is dropped" "
|
||||
reset_rebase &&
|
||||
git rebase -p h t &&
|
||||
test_cmp_rev h HEAD~2 &&
|
||||
test_linear_range 'd e' h..
|
||||
"
|
||||
|
||||
# a---b---c
|
||||
# \
|
||||
# d---e
|
||||
# \ \
|
||||
# n---r
|
||||
# \
|
||||
# o
|
||||
#
|
||||
# r = tree-same with n
|
||||
test_expect_success 'setup of non-linear-history for empty commits' '
|
||||
git checkout n &&
|
||||
git merge --no-commit e &&
|
||||
git reset n . &&
|
||||
git commit -m r &&
|
||||
git reset --hard &&
|
||||
git clean -f &&
|
||||
git tag r
|
||||
'
|
||||
|
||||
test_expect_success "rebase -p re-creates empty internal merge commit" "
|
||||
reset_rebase &&
|
||||
git rebase -p c r &&
|
||||
test_cmp_rev c HEAD~3 &&
|
||||
test_cmp_rev HEAD^2^ HEAD~2 &&
|
||||
test_revision_subjects 'd e n r' HEAD~2 HEAD^2 HEAD^ HEAD
|
||||
"
|
||||
|
||||
test_expect_success "rebase -p re-creates empty merge commit" "
|
||||
reset_rebase &&
|
||||
git rebase -p o r &&
|
||||
test_cmp_rev e HEAD^2 &&
|
||||
test_cmp_rev o HEAD^ &&
|
||||
test_revision_subjects 'r' HEAD
|
||||
"
|
||||
|
||||
test_done
|
||||
|
||||
@ -36,11 +36,10 @@ commit_message() {
|
||||
# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
|
||||
#
|
||||
# This commit history is then rebased onto `topic_3` with the
|
||||
# `-Xsubtree=files_subtree` option in three different ways:
|
||||
# `-Xsubtree=files_subtree` option in two different ways:
|
||||
#
|
||||
# 1. using `--preserve-merges`
|
||||
# 2. using `--preserve-merges` and --keep-empty
|
||||
# 3. without specifying a rebase backend
|
||||
# 1. without specifying a rebase backend
|
||||
# 2. using the `--rebase-merges` backend
|
||||
|
||||
test_expect_success 'setup' '
|
||||
test_commit README &&
|
||||
@ -69,25 +68,6 @@ test_expect_success 'setup' '
|
||||
git commit -m "Empty commit" --allow-empty
|
||||
'
|
||||
|
||||
# FAILURE: Does not preserve topic_4.
|
||||
test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
|
||||
reset_rebase &&
|
||||
git checkout -b rebase-preserve-merges to-rebase &&
|
||||
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main &&
|
||||
verbose test "$(commit_message HEAD~)" = "topic_4" &&
|
||||
verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
|
||||
'
|
||||
|
||||
# FAILURE: Does not preserve topic_4.
|
||||
test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
|
||||
reset_rebase &&
|
||||
git checkout -b rebase-keep-empty to-rebase &&
|
||||
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main &&
|
||||
verbose test "$(commit_message HEAD~2)" = "topic_4" &&
|
||||
verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
|
||||
verbose test "$(commit_message HEAD)" = "Empty commit"
|
||||
'
|
||||
|
||||
test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
|
||||
reset_rebase &&
|
||||
git checkout -b rebase-onto to-rebase &&
|
||||
|
||||
@ -546,15 +546,6 @@ test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P \
|
||||
'pull.rebase=preserve rebases and merges keep-merge' '
|
||||
git reset --hard before-preserve-rebase &&
|
||||
test_config pull.rebase preserve &&
|
||||
git pull . copy &&
|
||||
test_cmp_rev HEAD^^ copy &&
|
||||
test_cmp_rev HEAD^2 keep-merge
|
||||
'
|
||||
|
||||
test_expect_success 'pull.rebase=interactive' '
|
||||
write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
|
||||
echo I was here >fake.out &&
|
||||
@ -598,7 +589,7 @@ test_expect_success '--rebase=false create a new merge commit' '
|
||||
|
||||
test_expect_success '--rebase=true rebases and flattens keep-merge' '
|
||||
git reset --hard before-preserve-rebase &&
|
||||
test_config pull.rebase preserve &&
|
||||
test_config pull.rebase merges &&
|
||||
git pull --rebase=true . copy &&
|
||||
test_cmp_rev HEAD^^ copy &&
|
||||
echo file3 >expect &&
|
||||
@ -606,23 +597,14 @@ test_expect_success '--rebase=true rebases and flattens keep-merge' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P \
|
||||
'--rebase=preserve rebases and merges keep-merge' '
|
||||
git reset --hard before-preserve-rebase &&
|
||||
test_config pull.rebase true &&
|
||||
git pull --rebase=preserve . copy &&
|
||||
test_cmp_rev HEAD^^ copy &&
|
||||
test_cmp_rev HEAD^2 keep-merge
|
||||
'
|
||||
|
||||
test_expect_success '--rebase=invalid fails' '
|
||||
git reset --hard before-preserve-rebase &&
|
||||
test_must_fail git pull --rebase=invalid . copy
|
||||
'
|
||||
|
||||
test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
|
||||
test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
|
||||
git reset --hard before-preserve-rebase &&
|
||||
test_config pull.rebase preserve &&
|
||||
test_config pull.rebase merges &&
|
||||
git pull --rebase . copy &&
|
||||
test_cmp_rev HEAD^^ copy &&
|
||||
echo file3 >expect &&
|
||||
|
||||
@ -250,7 +250,6 @@ test_rebase () {
|
||||
}
|
||||
|
||||
test_rebase success
|
||||
test_have_prereq !REBASE_P || test_rebase success -p
|
||||
|
||||
test_expect_success 'with hook (cherry-pick)' '
|
||||
test_when_finished "git checkout -f main" &&
|
||||
|
||||
@ -75,19 +75,6 @@ test_expect_success 'noop interactive rebase does not care about ident' '
|
||||
git rebase -i HEAD^
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P \
|
||||
'fast-forward rebase does not care about ident (preserve)' '
|
||||
git checkout -B tmp side-without-commit &&
|
||||
git rebase -p main
|
||||
'
|
||||
|
||||
test_expect_success REBASE_P \
|
||||
'non-fast-forward rebase refuses to write commits (preserve)' '
|
||||
test_when_finished "git rebase --abort || true" &&
|
||||
git checkout -B tmp side-with-commit &&
|
||||
test_must_fail git rebase -p main
|
||||
'
|
||||
|
||||
test_expect_success 'author.name overrides user.name' '
|
||||
test_config user.name user &&
|
||||
test_config user.email user@example.com &&
|
||||
|
||||
@ -1730,10 +1730,6 @@ test_lazy_prereq SHA1 '
|
||||
esac
|
||||
'
|
||||
|
||||
test_lazy_prereq REBASE_P '
|
||||
test -z "$GIT_TEST_SKIP_REBASE_P"
|
||||
'
|
||||
|
||||
# Ensure that no test accidentally triggers a Git command
|
||||
# that runs the actual maintenance scheduler, affecting a user's
|
||||
# system permanently.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user