{"thread":{"id":"52325","subject":"[PATCH 0/8] Drop support for git rebase --preserve-merges","startedAt":"2019-11-23T20:50:47Z","lastAt":"2022-07-29T13:25:13Z","messageCount":78,"participants":["Johannes Schindelin via GitGitGadget","Eric Wong","Johannes Schindelin","Ævar Arnfjörð Bjarmason","Junio C Hamano","Johannes Sixt","Alban Gruin","Phillip Wood","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"386915","messageId":"pull.195.git.1574542242.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":null,"subject":"[PATCH 0/8] Drop support for git rebase --preserve-merges","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:34Z","receivedAt":"2019-11-23T20:50:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"In 427c3bd28ab (rebase: deprecate --preserve-merges, 2019-03-11) (which was\nincluded in v2.22.0), we officially deprecated the --preserve-merges \nbackend. This patch series drops that deprecated backend. Maybe we want to\nmake that happen around v2.26.0?\n\nNote: this patch series is based on js/git-svn-use-rebase-merges\n\nJohannes Schindelin (8):\n t5520: do not use `pull.rebase=preserve`\n remote: warn about unhandled branch..rebase values\n tests: stop testing `git rebase --preserve-merges`\n pull: remove support for `--rebase=preserve`\n rebase: drop support for `--preserve-merges`\n git-svn: drop support for `--preserve-merges`\n rebase: drop the internal `rebase--interactive` command\n remote: no longer claim that branch.*.rebase=preserve is a thing\n\n .gitignore | 1 -\n Documentation/config/branch.txt | 4 -\n Documentation/config/pull.txt | 4 -\n Documentation/git-pull.txt | 6 +-\n Documentation/git-rebase.txt | 47 -\n Documentation/git-svn.txt | 1 -\n Makefile | 2 -\n azure-pipelines.yml | 2 -\n builtin/pull.c | 12 +-\n builtin/rebase.c | 316 +-----\n builtin/remote.c | 5 +-\n contrib/completion/git-completion.bash | 2 +-\n git-rebase--preserve-merges.sh | 1067 ---------------------\n git-svn.perl | 1 -\n git.c | 1 -\n t/t3404-rebase-interactive.sh | 76 --\n t/t3408-rebase-multi-line.sh | 10 -\n t/t3409-rebase-preserve-merges.sh | 127 ---\n t/t3410-rebase-preserve-dropped-merges.sh | 90 --\n t/t3411-rebase-preserve-around-merges.sh | 80 --\n t/t3412-rebase-root.sh | 37 -\n t/t3414-rebase-preserve-onto.sh | 85 --\n t/t3418-rebase-continue.sh | 15 -\n t/t3421-rebase-topology-linear.sh | 19 -\n t/t3422-rebase-incompatible-options.sh | 11 -\n t/t3425-rebase-topology-merges.sh | 151 ---\n t/t3427-rebase-subtree.sh | 19 -\n t/t5520-pull.sh | 24 +-\n t/t7505-prepare-commit-msg-hook.sh | 1 -\n t/t7517-per-repo-email.sh | 13 -\n t/test-lib.sh | 4 -\n 31 files changed, 17 insertions(+), 2216 deletions(-)\n delete mode 100644 git-rebase--preserve-merges.sh\n delete mode 100755 t/t3409-rebase-preserve-merges.sh\n delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh\n delete mode 100755 t/t3411-rebase-preserve-around-merges.sh\n delete mode 100755 t/t3414-rebase-preserve-onto.sh\n\n\nbase-commit: ea8b7be1476a2301e3658a8e626b69c9d7f540bd\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-195%2Fdscho%2Fdrop-rebase-p-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-195/dscho/drop-rebase-p-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/195\n-- \ngitgitgadget\n"},{"id":"386916","messageId":"662e16dbc1246ac5737723134471f47e4f582fc1.1574542242.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 1/8] t5520: do not use `pull.rebase=preserve`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:35Z","receivedAt":"2019-11-23T20:50:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nEven if those tests try to override that setting, let's not use it\nbecause it is deprecated: let's use `merges` instead.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t5520-pull.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex cf4cc32fd0..41b799e336 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -509,7 +509,7 @@ test_expect_success '--rebase=false create a new merge commit' '\n \n test_expect_success '--rebase=true rebases and flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n-\ttest_config pull.rebase preserve &&\n+\ttest_config pull.rebase merges &&\n \tgit pull --rebase=true . copy &&\n \ttest \"$(git rev-parse HEAD^^)\" = \"$(git rev-parse copy)\" &&\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n@@ -529,9 +529,9 @@ test_expect_success '--rebase=invalid fails' '\n \t! git pull --rebase=invalid . copy\n '\n \n-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '\n+test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '\n \tgit reset --hard before-preserve-rebase &&\n-\ttest_config pull.rebase preserve &&\n+\ttest_config pull.rebase merges &&\n \tgit pull --rebase . copy &&\n \ttest \"$(git rev-parse HEAD^^)\" = \"$(git rev-parse copy)\" &&\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n-- \ngitgitgadget\n\n"},{"id":"386917","messageId":"fb531064b35814e5f8f87baa2996522d7ca57148.1574542242.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 2/8] remote: warn about unhandled branch..rebase values","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:36Z","receivedAt":"2019-11-23T20:50:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe ignore them silently, but it actually makes sense to warn the users\nthat their config setting has no effect.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/remote.c | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 5591cef775..3410ea19c7 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -315,6 +315,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n \t\t\t\tinfo->rebase = REBASE_MERGES;\n \t\t\telse if (!strcmp(value, \"interactive\"))\n \t\t\t\tinfo->rebase = INTERACTIVE_REBASE;\n+\t\t\telse\n+\t\t\t\twarning(_(\"unhandled branch.%s.rebase=%s\"),\n+\t\t\t\t\tname, value);\n \t\t}\n \t}\n \treturn 0;\n-- \ngitgitgadget\n\n"},{"id":"386918","messageId":"0c8bfe5d18da5c8c5b3d63270aac3f93e793c69c.1574542243.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 4/8] pull: remove support for `--rebase=preserve`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:38Z","receivedAt":"2019-11-23T20:50:51Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn preparation for `git-rebase--preserve-merges.sh` entering its after\nlife, we remove this (deprecated) option that would still rely on it.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/config/branch.txt | 4 ----\n Documentation/config/pull.txt | 4 ----\n Documentation/git-pull.txt | 6 +-----\n builtin/pull.c | 12 +++---------\n contrib/completion/git-completion.bash | 2 +-\n 5 files changed, 5 insertions(+), 23 deletions(-)\n\ndiff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt\nindex a592d522a7..e9986ddd09 100644\n--- a/Documentation/config/branch.txt\n+++ b/Documentation/config/branch.txt\n@@ -85,10 +85,6 @@ When `merges`, pass the `--rebase-merges` option to 'git rebase'\n so that the local merge commits are included in the rebase (see\n linkgit:git-rebase[1] for details).\n +\n-When `preserve` (deprecated in favor of `merges`), also pass\n-`--preserve-merges` along to 'git rebase' so that locally committed merge\n-commits will not be flattened by running 'git pull'.\n-+\n When the value is `interactive`, the rebase is run in interactive mode.\n +\n *NOTE*: this is a possibly dangerous operation; do *not* use\ndiff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt\nindex b87cab31b3..9f2dea0b34 100644\n--- a/Documentation/config/pull.txt\n+++ b/Documentation/config/pull.txt\n@@ -18,10 +18,6 @@ When `merges`, pass the `--rebase-merges` option to 'git rebase'\n so that the local merge commits are included in the rebase (see\n linkgit:git-rebase[1] for details).\n +\n-When `preserve` (deprecated in favor of `merges`), also pass\n-`--preserve-merges` along to 'git rebase' so that locally committed merge\n-commits will not be flattened by running 'git pull'.\n-+\n When the value is `interactive`, the rebase is run in interactive mode.\n +\n *NOTE*: this is a possibly dangerous operation; do *not* use\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex dfb901f8b8..edda860a9a 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -101,7 +101,7 @@ Options related to merging\n include::merge-options.txt[]\n \n -r::\n---rebase[=false|true|merges|preserve|interactive]::\n+--rebase[=false|true|merges|interactive]::\n \tWhen true, rebase the current branch on top of the upstream\n \tbranch after fetching. If there is a remote-tracking branch\n \tcorresponding to the upstream branch and the upstream branch\n@@ -112,10 +112,6 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that\n the local merge commits are included in the rebase (see\n linkgit:git-rebase[1] for details).\n +\n-When set to `preserve` (deprecated in favor of `merges`), rebase with the\n-`--preserve-merges` option passed to `git rebase` so that locally created\n-merge commits will not be flattened.\n-+\n When false, merge the current branch into the upstream branch.\n +\n When `interactive`, enable the interactive mode of rebase.\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex d25ff13a60..6c4d91d580 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -30,7 +30,6 @@ enum rebase_type {\n \tREBASE_INVALID = -1,\n \tREBASE_FALSE = 0,\n \tREBASE_TRUE,\n-\tREBASE_PRESERVE,\n \tREBASE_MERGES,\n \tREBASE_INTERACTIVE\n };\n@@ -38,9 +37,8 @@ enum rebase_type {\n /**\n * Parses the value of --rebase. If value is a false value, returns\n * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is\n- * \"merges\", returns REBASE_MERGES. If value is \"preserve\", returns\n- * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if\n- * fatal is true, otherwise returns REBASE_INVALID.\n+ * \"merges\", returns REBASE_MERGES. If value is a invalid value, dies with\n+ * a fatal error if fatal is true, otherwise returns REBASE_INVALID.\n */\n static enum rebase_type parse_config_rebase(const char *key, const char *value,\n \t\tint fatal)\n@@ -51,8 +49,6 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,\n \t\treturn REBASE_FALSE;\n \telse if (v > 0)\n \t\treturn REBASE_TRUE;\n-\telse if (!strcmp(value, \"preserve\") || !strcmp(value, \"p\"))\n-\t\treturn REBASE_PRESERVE;\n \telse if (!strcmp(value, \"merges\") || !strcmp(value, \"m\"))\n \t\treturn REBASE_MERGES;\n \telse if (!strcmp(value, \"interactive\") || !strcmp(value, \"i\"))\n@@ -145,7 +141,7 @@ static struct option pull_options[] = {\n \t/* Options passed to git-merge or git-rebase */\n \tOPT_GROUP(N_(\"Options related to merging\")),\n \t{ OPTION_CALLBACK, 'r', \"rebase\", &opt_rebase,\n-\t \"(false|true|merges|preserve|interactive)\",\n+\t \"(false|true|merges|interactive)\",\n \t N_(\"incorporate changes by rebasing rather than merging\"),\n \t PARSE_OPT_OPTARG, parse_opt_rebase },\n \tOPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,\n@@ -848,8 +844,6 @@ static int run_rebase(const struct object_id *curr_head,\n \t/* Options passed to git-rebase */\n \tif (opt_rebase == REBASE_MERGES)\n \t\targv_array_push(&args, \"--rebase-merges\");\n-\telse if (opt_rebase == REBASE_PRESERVE)\n-\t\targv_array_push(&args, \"--preserve-merges\");\n \telse if (opt_rebase == REBASE_INTERACTIVE)\n \t\targv_array_push(&args, \"--interactive\");\n \tif (opt_diffstat)\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 00fbe6c03d..5b37734ef1 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2276,7 +2276,7 @@ __git_complete_config_variable_value ()\n \t\treturn\n \t\t;;\n \tbranch.*.rebase)\n-\t\t__gitcomp \"false true merges preserve interactive\" \"\" \"$cur_\"\n+\t\t__gitcomp \"false true merges interactive\" \"\" \"$cur_\"\n \t\treturn\n \t\t;;\n \tremote.pushdefault)\n-- \ngitgitgadget\n\n"},{"id":"386919","messageId":"b7ba83969da8fd2db4e6074d5044938c05b992fd.1574542243.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 6/8] git-svn: drop support for `--preserve-merges`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:40Z","receivedAt":"2019-11-23T20:50:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe already passed the `--rebase-merges` option to `git rebase` instead,\nnow we make this move permanent.\n\nSigned-off-by: Johannes Schindelin \n---\n Documentation/git-svn.txt | 1 -\n git-svn.perl | 1 -\n 2 files changed, 2 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 6624a14fbd..6cfd48c9d3 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -678,7 +678,6 @@ config key: svn.authorsProg\n --strategy=::\n -p::\n --rebase-merges::\n---preserve-merges (DEPRECATED)::\n \tThese are only used with the 'dcommit' and 'rebase' commands.\n +\n Passed directly to 'git rebase' when using 'dcommit' if a\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 4aa208ff5f..f1fa1bc7f7 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -271,7 +271,6 @@ sub _req_svn {\n \t\t\t 'fetch-all|all' => \\$_fetch_all,\n \t\t\t 'dry-run|n' => \\$_dry_run,\n \t\t\t 'rebase-merges|p' => \\$_rebase_merges,\n-\t\t\t 'preserve-merges|p' => \\$_rebase_merges,\n \t\t\t %fc_opts } ],\n \t'commit-diff' => [ \\&cmd_commit_diff,\n \t 'Commit a diff between two trees',\n-- \ngitgitgadget\n\n"},{"id":"386921","messageId":"b614336f3df5f433478eb1c1bdaa443919196347.1574542242.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 3/8] tests: stop testing `git rebase --preserve-merges`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:37Z","receivedAt":"2019-11-23T20:50:54Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis backend has been deprecated in favor of `git rebase\n--rebase-merges`.\n\nIn preparation for dropping it, let's remove all the regression tests\nthat would need it.\n\nSigned-off-by: Johannes Schindelin \n---\n azure-pipelines.yml | 2 -\n t/t3404-rebase-interactive.sh | 76 -----------\n t/t3408-rebase-multi-line.sh | 10 --\n t/t3409-rebase-preserve-merges.sh | 127 ------------------\n t/t3410-rebase-preserve-dropped-merges.sh | 90 -------------\n t/t3411-rebase-preserve-around-merges.sh | 80 ------------\n t/t3412-rebase-root.sh | 37 ------\n t/t3414-rebase-preserve-onto.sh | 85 ------------\n t/t3418-rebase-continue.sh | 15 ---\n t/t3421-rebase-topology-linear.sh | 19 ---\n t/t3422-rebase-incompatible-options.sh | 11 --\n t/t3425-rebase-topology-merges.sh | 151 ----------------------\n t/t3427-rebase-subtree.sh | 19 ---\n t/t5520-pull.sh | 18 ---\n t/t7505-prepare-commit-msg-hook.sh | 1 -\n t/t7517-per-repo-email.sh | 13 --\n t/test-lib.sh | 4 -\n 17 files changed, 758 deletions(-)\n delete mode 100755 t/t3409-rebase-preserve-merges.sh\n delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh\n delete mode 100755 t/t3411-rebase-preserve-around-merges.sh\n delete mode 100755 t/t3414-rebase-preserve-onto.sh\n\ndiff --git a/azure-pipelines.yml b/azure-pipelines.yml\nindex af2a5ea484..c75f27a7fa 100644\n--- a/azure-pipelines.yml\n+++ b/azure-pipelines.yml\n@@ -106,7 +106,6 @@ jobs:\n HOME: $(Build.SourcesDirectory)\n MSYSTEM: MINGW64\n NO_SVN_TESTS: 1\n- GIT_TEST_SKIP_REBASE_P: 1\n - powershell: |\n if (\"$GITFILESHAREPWD\" -ne \"\" -and \"$GITFILESHAREPWD\" -ne \"`$`(gitfileshare.pwd)\") {\n cmd /c rmdir \"$(Build.SourcesDirectory)\\test-cache\"\n@@ -265,7 +264,6 @@ jobs:\n HOME: $(Build.SourcesDirectory)\n MSYSTEM: MINGW64\n NO_SVN_TESTS: 1\n- GIT_TEST_SKIP_REBASE_P: 1\n - powershell: |\n if (\"$GITFILESHAREPWD\" -ne \"\" -and \"$GITFILESHAREPWD\" -ne \"`$`(gitfileshare.pwd)\") {\n cmd /c rmdir \"$(Build.SourcesDirectory)\\test-cache\"\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex bf0dc756d2..c14a664604 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -345,82 +345,6 @@ test_expect_success 'retain authorship when squashing' '\n \tgit show HEAD | grep \"^Author: Twerp Snog\"\n '\n \n-test_expect_success REBASE_P '-p handles \"no changes\" gracefully' '\n-\tHEAD=$(git rev-parse HEAD) &&\n-\tgit rebase -i -p HEAD^ &&\n-\tgit update-index --refresh &&\n-\tgit diff-files --quiet &&\n-\tgit diff-index --quiet --cached HEAD -- &&\n-\ttest $HEAD = $(git rev-parse HEAD)\n-'\n-\n-test_expect_failure REBASE_P 'exchange two commits with -p' '\n-\tgit checkout H &&\n-\t(\n-\t\tset_fake_editor &&\n-\t\tFAKE_LINES=\"2 1\" git rebase -i -p HEAD~2\n-\t) &&\n-\ttest H = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n-\ttest G = $(git cat-file commit HEAD | sed -ne \\$p)\n-'\n-\n-test_expect_success REBASE_P 'preserve merges with -p' '\n-\tgit checkout -b to-be-preserved master^ &&\n-\t: > unrelated-file &&\n-\tgit add unrelated-file &&\n-\ttest_tick &&\n-\tgit commit -m \"unrelated\" &&\n-\tgit checkout -b another-branch master &&\n-\techo B > file1 &&\n-\ttest_tick &&\n-\tgit commit -m J file1 &&\n-\ttest_tick &&\n-\tgit merge to-be-preserved &&\n-\techo C > file1 &&\n-\ttest_tick &&\n-\tgit commit -m K file1 &&\n-\techo D > file1 &&\n-\ttest_tick &&\n-\tgit commit -m L1 file1 &&\n-\tgit checkout HEAD^ &&\n-\techo 1 > unrelated-file &&\n-\ttest_tick &&\n-\tgit commit -m L2 unrelated-file &&\n-\ttest_tick &&\n-\tgit merge another-branch &&\n-\techo E > file1 &&\n-\ttest_tick &&\n-\tgit commit -m M file1 &&\n-\tgit checkout -b to-be-rebased &&\n-\ttest_tick &&\n-\tgit rebase -i -p --onto branch1 master &&\n-\tgit update-index --refresh &&\n-\tgit diff-files --quiet &&\n-\tgit diff-index --quiet --cached HEAD -- &&\n-\ttest $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&\n-\ttest $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&\n-\ttest $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&\n-\ttest $(git show HEAD~5:file1) = B &&\n-\ttest $(git show HEAD~3:file1) = C &&\n-\ttest $(git show HEAD:file1) = E &&\n-\ttest $(git show HEAD:unrelated-file) = 1\n-'\n-\n-test_expect_success REBASE_P 'edit ancestor with -p' '\n-\t(\n-\t\tset_fake_editor &&\n-\t\tFAKE_LINES=\"1 2 edit 3 4\" git rebase -i -p HEAD~3\n-\t) &&\n-\techo 2 > unrelated-file &&\n-\ttest_tick &&\n-\tgit commit -m L2-modified --amend unrelated-file &&\n-\tgit rebase --continue &&\n-\tgit update-index --refresh &&\n-\tgit diff-files --quiet &&\n-\tgit diff-index --quiet --cached HEAD -- &&\n-\ttest $(git show HEAD:unrelated-file) = 2\n-'\n-\n test_expect_success '--continue tries to commit' '\n \tgit reset --hard D &&\n \ttest_tick &&\ndiff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh\nindex d2bd7c17b0..126845a97c 100755\n--- a/t/t3408-rebase-multi-line.sh\n+++ b/t/t3408-rebase-multi-line.sh\n@@ -52,14 +52,4 @@ test_expect_success rebase '\n \ttest_cmp expect actual\n \n '\n-test_expect_success REBASE_P rebasep '\n-\n-\tgit checkout side-merge &&\n-\tgit rebase -p side &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" >actual &&\n-\tgit cat-file commit side-merge-original | sed -e \"1,/^\\$/d\" >expect &&\n-\ttest_cmp expect actual\n-\n-'\n-\n test_done\ndiff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh\ndeleted file mode 100755\nindex 3b340f1ece..0000000000\n--- a/t/t3409-rebase-preserve-merges.sh\n+++ /dev/null\n@@ -1,127 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright(C) 2008 Stephen Habermann & Andreas Ericsson\n-#\n-test_description='git rebase -p should preserve merges\n-\n-Run \"git rebase -p\" and check that merges are properly carried along\n-'\n-. ./test-lib.sh\n-\n-if ! test_have_prereq REBASE_P; then\n-\tskip_all='skipping git rebase -p tests, as asked for'\n-\ttest_done\n-fi\n-\n-GIT_AUTHOR_EMAIL=bogus_email_address\n-export GIT_AUTHOR_EMAIL\n-\n-# Clone 2 (conflicting merge):\n-#\n-# A1--A2--B3 <-- origin/master\n-# \\ \\\n-# B1------M <-- topic\n-# \\\n-# B2 <-- origin/topic\n-#\n-# Clone 3 (no-ff merge):\n-#\n-# A1--A2--B3 <-- origin/master\n-# \\\n-# B1------M <-- topic\n-# \\ /\n-# \\--A3 <-- topic2\n-# \\\n-# B2 <-- origin/topic\n-#\n-# Clone 4 (same as Clone 3)\n-\n-test_expect_success 'setup for merge-preserving rebase' \\\n-\t'echo First > A &&\n-\tgit add A &&\n-\tgit commit -m \"Add A1\" &&\n-\tgit checkout -b topic &&\n-\techo Second > B &&\n-\tgit add B &&\n-\tgit commit -m \"Add B1\" &&\n-\tgit checkout -f master &&\n-\techo Third >> A &&\n-\tgit commit -a -m \"Modify A2\" &&\n-\techo Fifth > B &&\n-\tgit add B &&\n-\tgit commit -m \"Add different B\" &&\n-\n-\tgit clone ./. clone2 &&\n-\t(\n-\t\tcd clone2 &&\n-\t\tgit checkout -b topic origin/topic &&\n-\t\ttest_must_fail git merge origin/master &&\n-\t\techo Resolved >B &&\n-\t\tgit add B &&\n-\t\tgit commit -m \"Merge origin/master into topic\"\n-\t) &&\n-\n-\tgit clone ./. clone3 &&\n-\t(\n-\t\tcd clone3 &&\n-\t\tgit checkout -b topic2 origin/topic &&\n-\t\techo Sixth > A &&\n-\t\tgit commit -a -m \"Modify A3\" &&\n-\t\tgit checkout -b topic origin/topic &&\n-\t\tgit merge --no-ff topic2\n-\t) &&\n-\n-\tgit clone ./. clone4 &&\n-\t(\n-\t\tcd clone4 &&\n-\t\tgit checkout -b topic2 origin/topic &&\n-\t\techo Sixth > A &&\n-\t\tgit commit -a -m \"Modify A3\" &&\n-\t\tgit checkout -b topic origin/topic &&\n-\t\tgit merge --no-ff topic2\n-\t) &&\n-\n-\tgit checkout topic &&\n-\techo Fourth >> B &&\n-\tgit commit -a -m \"Modify B2\"\n-'\n-\n-test_expect_success '--continue works after a conflict' '\n-\t(\n-\tcd clone2 &&\n-\tgit fetch &&\n-\ttest_must_fail git rebase -p origin/topic &&\n-\ttest 2 = $(git ls-files B | wc -l) &&\n-\techo Resolved again > B &&\n-\ttest_must_fail git rebase --continue &&\n-\tgrep \"^@@@ \" .git/rebase-merge/patch &&\n-\tgit add B &&\n-\tgit rebase --continue &&\n-\ttest 1 = $(git rev-list --all --pretty=oneline | grep \"Modify A\" | wc -l) &&\n-\ttest 1 = $(git rev-list --all --pretty=oneline | grep \"Add different\" | wc -l) &&\n-\ttest 1 = $(git rev-list --all --pretty=oneline | grep \"Merge origin\" | wc -l)\n-\t)\n-'\n-\n-test_expect_success 'rebase -p preserves no-ff merges' '\n-\t(\n-\tcd clone3 &&\n-\tgit fetch &&\n-\tgit rebase -p origin/topic &&\n-\ttest 3 = $(git rev-list --all --pretty=oneline | grep \"Modify A\" | wc -l) &&\n-\ttest 1 = $(git rev-list --all --pretty=oneline | grep \"Merge branch\" | wc -l)\n-\t)\n-'\n-\n-test_expect_success 'rebase -p ignores merge.log config' '\n-\t(\n-\tcd clone4 &&\n-\tgit fetch &&\n-\tgit -c merge.log=1 rebase -p origin/topic &&\n-\techo >expected &&\n-\tgit log --format=\"%b\" -1 >current &&\n-\ttest_cmp expected current\n-\t)\n-'\n-\n-test_done\ndiff --git a/t/t3410-rebase-preserve-dropped-merges.sh b/t/t3410-rebase-preserve-dropped-merges.sh\ndeleted file mode 100755\nindex 2e29866993..0000000000\n--- a/t/t3410-rebase-preserve-dropped-merges.sh\n+++ /dev/null\n@@ -1,90 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2008 Stephen Haberman\n-#\n-\n-test_description='git rebase preserve merges\n-\n-This test runs git rebase with preserve merges and ensures commits\n-dropped by the --cherry-pick flag have their childrens parents\n-rewritten.\n-'\n-. ./test-lib.sh\n-\n-if ! test_have_prereq REBASE_P; then\n-\tskip_all='skipping git rebase -p tests, as asked for'\n-\ttest_done\n-fi\n-\n-# set up two branches like this:\n-#\n-# A - B - C - D - E\n-# \\\n-# F - G - H\n-# \\\n-# I\n-#\n-# where B, D and G touch the same file.\n-\n-test_expect_success 'setup' '\n-\ttest_commit A file1 &&\n-\ttest_commit B file1 1 &&\n-\ttest_commit C file2 &&\n-\ttest_commit D file1 2 &&\n-\ttest_commit E file3 &&\n-\tgit checkout A &&\n-\ttest_commit F file4 &&\n-\ttest_commit G file1 3 &&\n-\ttest_commit H file5 &&\n-\tgit checkout F &&\n-\ttest_commit I file6\n-'\n-\n-# A - B - C - D - E\n-# \\ \\ \\\n-# F - G - H -- L \\ --> L\n-# \\ | \\\n-# I -- G2 -- J -- K I -- K\n-# G2 = same changes as G\n-test_expect_success 'skip same-resolution merges with -p' '\n-\tgit checkout H &&\n-\ttest_must_fail git merge E &&\n-\ttest_commit L file1 23 &&\n-\tgit checkout I &&\n-\ttest_commit G2 file1 3 &&\n-\ttest_must_fail git merge E &&\n-\ttest_commit J file1 23 &&\n-\ttest_commit K file7 file7 &&\n-\tgit rebase -i -p L &&\n-\ttest $(git rev-parse HEAD^^) = $(git rev-parse L) &&\n-\ttest \"23\" = \"$(cat file1)\" &&\n-\ttest \"I\" = \"$(cat file6)\" &&\n-\ttest \"file7\" = \"$(cat file7)\"\n-'\n-\n-# A - B - C - D - E\n-# \\ \\ \\\n-# F - G - H -- L2 \\ --> L2\n-# \\ | \\\n-# I -- G3 --- J2 -- K2 I -- G3 -- K2\n-# G2 = different changes as G\n-test_expect_success 'keep different-resolution merges with -p' '\n-\tgit checkout H &&\n-\ttest_must_fail git merge E &&\n-\ttest_commit L2 file1 23 &&\n-\tgit checkout I &&\n-\ttest_commit G3 file1 4 &&\n-\ttest_must_fail git merge E &&\n-\ttest_commit J2 file1 24 &&\n-\ttest_commit K2 file7 file7 &&\n-\ttest_must_fail git rebase -i -p L2 &&\n-\techo 234 > file1 &&\n-\tgit add file1 &&\n-\tgit rebase --continue &&\n-\ttest $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&\n-\ttest \"234\" = \"$(cat file1)\" &&\n-\ttest \"I\" = \"$(cat file6)\" &&\n-\ttest \"file7\" = \"$(cat file7)\"\n-'\n-\n-test_done\ndiff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh\ndeleted file mode 100755\nindex fb45e7bf7b..0000000000\n--- a/t/t3411-rebase-preserve-around-merges.sh\n+++ /dev/null\n@@ -1,80 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2008 Stephen Haberman\n-#\n-\n-test_description='git rebase preserve merges\n-\n-This test runs git rebase with -p and tries to squash a commit from after\n-a merge to before the merge.\n-'\n-. ./test-lib.sh\n-\n-if ! test_have_prereq REBASE_P; then\n-\tskip_all='skipping git rebase -p tests, as asked for'\n-\ttest_done\n-fi\n-\n-. \"$TEST_DIRECTORY\"/lib-rebase.sh\n-\n-set_fake_editor\n-\n-# set up two branches like this:\n-#\n-# A1 - B1 - D1 - E1 - F1\n-# \\ /\n-# -- C1 --\n-\n-test_expect_success 'setup' '\n-\ttest_commit A1 &&\n-\ttest_commit B1 &&\n-\ttest_commit C1 &&\n-\tgit reset --hard B1 &&\n-\ttest_commit D1 &&\n-\ttest_merge E1 C1 &&\n-\ttest_commit F1\n-'\n-\n-# Should result in:\n-#\n-# A1 - B1 - D2 - E2\n-# \\ /\n-# -- C1 --\n-#\n-test_expect_success 'squash F1 into D1' '\n-\tFAKE_LINES=\"1 squash 4 2 3\" git rebase -i -p B1 &&\n-\ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse C1)\" &&\n-\ttest \"$(git rev-parse HEAD~2)\" = \"$(git rev-parse B1)\" &&\n-\tgit tag E2\n-'\n-\n-# Start with:\n-#\n-# A1 - B1 - D2 - E2\n-# \\\n-# G1 ---- L1 ---- M1\n-# \\ /\n-# H1 -- J1 -- K1\n-# \\ /\n-# -- I1 --\n-#\n-# And rebase G1..M1 onto E2\n-\n-test_expect_success 'rebase two levels of merge' '\n-\tgit checkout A1 &&\n-\ttest_commit G1 &&\n-\ttest_commit H1 &&\n-\ttest_commit I1 &&\n-\tgit checkout -b branch3 H1 &&\n-\ttest_commit J1 &&\n-\ttest_merge K1 I1 &&\n-\tgit checkout -b branch2 G1 &&\n-\ttest_commit L1 &&\n-\ttest_merge M1 K1 &&\n-\tGIT_EDITOR=: git rebase -i -p E2 &&\n-\ttest \"$(git rev-parse HEAD~3)\" = \"$(git rev-parse E2)\" &&\n-\ttest \"$(git rev-parse HEAD~2)\" = \"$(git rev-parse HEAD^2^2~2)\" &&\n-\ttest \"$(git rev-parse HEAD^2^1^1)\" = \"$(git rev-parse HEAD^2^2^1)\"\n-'\n-\n-test_done\ndiff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh\nindex 21632a984e..7ba343198a 100755\n--- a/t/t3412-rebase-root.sh\n+++ b/t/t3412-rebase-root.sh\n@@ -86,17 +86,6 @@ test_expect_success 'pre-rebase got correct input (4)' '\n \ttest \"z$(cat .git/PRE-REBASE-INPUT)\" = z--root,work4\n '\n \n-test_expect_success REBASE_P 'rebase -i -p with linear history' '\n-\tgit checkout -b work5 other &&\n-\tgit rebase -i -p --root --onto master &&\n-\tgit log --pretty=tformat:\"%s\" > rebased5 &&\n-\ttest_cmp expect rebased5\n-'\n-\n-test_expect_success REBASE_P 'pre-rebase got correct input (5)' '\n-\ttest \"z$(cat .git/PRE-REBASE-INPUT)\" = z--root,\n-'\n-\n test_expect_success 'set up merge history' '\n \tgit checkout other^ &&\n \tgit checkout -b side &&\n@@ -120,13 +109,6 @@ commit work6~4\n 1\n EOF\n \n-test_expect_success REBASE_P 'rebase -i -p with merge' '\n-\tgit checkout -b work6 other &&\n-\tgit rebase -i -p --root --onto master &&\n-\tlog_with_names work6 > rebased6 &&\n-\ttest_cmp expect-side rebased6\n-'\n-\n test_expect_success 'set up second root and merge' '\n \tgit symbolic-ref HEAD refs/heads/third &&\n \trm .git/index &&\n@@ -155,13 +137,6 @@ commit work7~5\n 1\n EOF\n \n-test_expect_success REBASE_P 'rebase -i -p with two roots' '\n-\tgit checkout -b work7 other &&\n-\tgit rebase -i -p --root --onto master &&\n-\tlog_with_names work7 > rebased7 &&\n-\ttest_cmp expect-third rebased7\n-'\n-\n test_expect_success 'setup pre-rebase hook that fails' '\n \tmkdir -p .git/hooks &&\n \tcat >.git/hooks/pre-rebase < B &&\n \tgit add B\n '\n \n-test_expect_success REBASE_P 'rebase -i -p --root with conflict (second part)' '\n-\tgit rebase --continue &&\n-\tlog_with_names conflict3 >out &&\n-\ttest_cmp expect-conflict-p out\n-'\n-\n test_done\ndiff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh\ndeleted file mode 100755\nindex 72e04b5386..0000000000\n--- a/t/t3414-rebase-preserve-onto.sh\n+++ /dev/null\n@@ -1,85 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2009 Greg Price\n-#\n-\n-test_description='git rebase -p should respect --onto\n-\n-In a rebase with --onto, we should rewrite all the commits that\n-aren'\"'\"'t on top of $ONTO, even if they are on top of $UPSTREAM.\n-'\n-. ./test-lib.sh\n-\n-if ! test_have_prereq REBASE_P; then\n-\tskip_all='skipping git rebase -p tests, as asked for'\n-\ttest_done\n-fi\n-\n-. \"$TEST_DIRECTORY\"/lib-rebase.sh\n-\n-# Set up branches like this:\n-# A1---B1---E1---F1---G1\n-# \\ \\ /\n-# \\ \\--C1---D1--/\n-# H1\n-\n-test_expect_success 'setup' '\n-\ttest_commit A1 &&\n-\ttest_commit B1 &&\n-\ttest_commit C1 &&\n-\ttest_commit D1 &&\n-\tgit reset --hard B1 &&\n-\ttest_commit E1 &&\n-\ttest_commit F1 &&\n-\ttest_merge G1 D1 &&\n-\tgit reset --hard A1 &&\n-\ttest_commit H1\n-'\n-\n-# Now rebase merge G1 from both branches' base B1, both should move:\n-# A1---B1---E1---F1---G1\n-# \\ \\ /\n-# \\ \\--C1---D1--/\n-# \\\n-# H1---E2---F2---G2\n-# \\ /\n-# \\--C2---D2--/\n-\n-test_expect_success 'rebase from B1 onto H1' '\n-\tgit checkout G1 &&\n-\tgit rebase -p --onto H1 B1 &&\n-\ttest \"$(git rev-parse HEAD^1^1^1)\" = \"$(git rev-parse H1)\" &&\n-\ttest \"$(git rev-parse HEAD^2^1^1)\" = \"$(git rev-parse H1)\"\n-'\n-\n-# On the other hand if rebase from E1 which is within one branch,\n-# then the other branch stays:\n-# A1---B1---E1---F1---G1\n-# \\ \\ /\n-# \\ \\--C1---D1--/\n-# \\ \\\n-# H1-----F3-----G3\n-\n-test_expect_success 'rebase from E1 onto H1' '\n-\tgit checkout G1 &&\n-\tgit rebase -p --onto H1 E1 &&\n-\ttest \"$(git rev-parse HEAD^1^1)\" = \"$(git rev-parse H1)\" &&\n-\ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse D1)\"\n-'\n-\n-# And the same if we rebase from a commit in the second-parent branch.\n-# A1---B1---E1---F1----G1\n-# \\ \\ \\ /\n-# \\ \\--C1---D1-\\-/\n-# \\ \\\n-# H1------D3------G4\n-\n-test_expect_success 'rebase from C1 onto H1' '\n-\tgit checkout G1 &&\n-\tgit rev-list --first-parent --pretty=oneline C1..G1 &&\n-\tgit rebase -p --onto H1 C1 &&\n-\ttest \"$(git rev-parse HEAD^2^1)\" = \"$(git rev-parse H1)\" &&\n-\ttest \"$(git rev-parse HEAD^1)\" = \"$(git rev-parse F1)\"\n-'\n-\n-test_done\ndiff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh\nindex 7a2da972fd..ce78b6b97b 100755\n--- a/t/t3418-rebase-continue.sh\n+++ b/t/t3418-rebase-continue.sh\n@@ -106,20 +106,6 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' '\n \ttest -f funny.was.run\n '\n \n-test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '\n-\trm -fr .git/rebase-* &&\n-\tgit reset --hard commit-new-file-F3-on-topic-branch &&\n-\ttest_commit theirs-to-merge &&\n-\tgit reset --hard HEAD^ &&\n-\ttest_commit some-commit &&\n-\ttest_tick &&\n-\tgit merge --no-ff theirs-to-merge &&\n-\tFAKE_LINES=\"1 edit 2 3\" git rebase -i -f -p -m \\\n-\t\t-s recursive --strategy-option=theirs HEAD~2 &&\n-\ttest_commit force-change &&\n-\tgit rebase --continue\n-'\n-\n test_expect_success 'rebase -r passes merge strategy options correctly' '\n \trm -fr .git/rebase-* &&\n \tgit reset --hard commit-new-file-F3-on-topic-branch &&\n@@ -255,7 +241,6 @@ test_rerere_autoupdate\n test_rerere_autoupdate -m\n GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR\n test_rerere_autoupdate -i\n-test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges\n unset GIT_SEQUENCE_EDITOR\n \n test_expect_success 'the todo command \"break\" works' '\ndiff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh\nindex b847064f91..40375aff58 100755\n--- a/t/t3421-rebase-topology-linear.sh\n+++ b/t/t3421-rebase-topology-linear.sh\n@@ -29,7 +29,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_expect_success 'setup branches and remote tracking' '\n \tgit tag -l >tags &&\n@@ -53,7 +52,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -70,7 +68,6 @@ test_run_rebase success ''\n test_run_rebase success --fork-point\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -87,7 +84,6 @@ test_run_rebase success ''\n test_run_rebase success --fork-point\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -102,7 +98,6 @@ test_run_rebase success ''\n test_run_rebase success --fork-point\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n # f\n # /\n@@ -142,7 +137,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -157,7 +151,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -172,7 +165,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -187,7 +179,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n # a---b---c---j!\n # \\\n@@ -215,7 +206,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -230,7 +220,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -245,7 +234,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n test_run_rebase success --rebase-merges\n \n # m\n@@ -285,7 +273,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -300,7 +287,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -315,7 +301,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -331,7 +316,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -346,7 +330,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -360,7 +343,6 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase failure -p\n \n test_run_rebase () {\n \tresult=$1\n@@ -375,6 +357,5 @@ test_run_rebase () {\n test_run_rebase success ''\n test_run_rebase success -m\n test_run_rebase success -i\n-test_have_prereq !REBASE_P || test_run_rebase success -p\n \n test_done\ndiff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh\nindex 50e7960702..c1c9772ac2 100755\n--- a/t/t3422-rebase-incompatible-options.sh\n+++ b/t/t3422-rebase-incompatible-options.sh\n@@ -65,15 +65,4 @@ test_rebase_am_only --ignore-whitespace\n test_rebase_am_only --committer-date-is-author-date\n test_rebase_am_only -C4\n \n-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '\n-\tgit checkout B^0 &&\n-\ttest_must_fail git rebase --preserve-merges --signoff A\n-'\n-\n-test_expect_success REBASE_P \\\n-\t'--preserve-merges incompatible with --rebase-merges' '\n-\tgit checkout B^0 &&\n-\ttest_must_fail git rebase --preserve-merges --rebase-merges A\n-'\n-\n test_done\ndiff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh\nindex fd8efe84fe..88874c1e50 100755\n--- a/t/t3425-rebase-topology-merges.sh\n+++ b/t/t3425-rebase-topology-merges.sh\n@@ -106,155 +106,4 @@ test_run_rebase success 'd n o e' ''\n test_run_rebase success 'd n o e' -m\n test_run_rebase success 'd n o e' -i\n \n-if ! test_have_prereq REBASE_P; then\n-\tskip_all='skipping git rebase -p tests, as asked for'\n-\ttest_done\n-fi\n-\n-test_expect_success \"rebase -p is no-op in non-linear history\" \"\n-\treset_rebase &&\n-\tgit rebase -p d w &&\n-\ttest_cmp_rev w HEAD\n-\"\n-\n-test_expect_success \"rebase -p is no-op when base inside second parent\" \"\n-\treset_rebase &&\n-\tgit rebase -p e w &&\n-\ttest_cmp_rev w HEAD\n-\"\n-\n-test_expect_failure \"rebase -p --root on non-linear history is a no-op\" \"\n-\treset_rebase &&\n-\tgit rebase -p --root w &&\n-\ttest_cmp_rev w HEAD\n-\"\n-\n-test_expect_success \"rebase -p re-creates merge from side branch\" \"\n-\treset_rebase &&\n-\tgit rebase -p z w &&\n-\ttest_cmp_rev z HEAD^ &&\n-\ttest_cmp_rev w^2 HEAD^2\n-\"\n-\n-test_expect_success \"rebase -p re-creates internal merge\" \"\n-\treset_rebase &&\n-\tgit rebase -p c w &&\n-\ttest_cmp_rev c HEAD~4 &&\n-\ttest_cmp_rev HEAD^2^ HEAD~3 &&\n-\ttest_revision_subjects 'd n e o w' HEAD~3 HEAD~2 HEAD^2 HEAD^ HEAD\n-\"\n-\n-test_expect_success \"rebase -p can re-create two branches on onto\" \"\n-\treset_rebase &&\n-\tgit rebase -p --onto c d w &&\n-\ttest_cmp_rev c HEAD~3 &&\n-\ttest_cmp_rev c HEAD^2^ &&\n-\ttest_revision_subjects 'n e o w' HEAD~2 HEAD^2 HEAD^ HEAD\n-\"\n-\n-# f\n-# /\n-# a---b---c---g---h\n-# \\\n-# d---gp--i\n-# \\ \\\n-# e-------u\n-#\n-# gp = cherry-picked g\n-# h = reverted g\n-test_expect_success 'setup of non-linear-history for patch-equivalence tests' '\n-\tgit checkout e &&\n-\ttest_merge u i\n-'\n-\n-test_expect_success \"rebase -p re-creates history around dropped commit matching upstream\" \"\n-\treset_rebase &&\n-\tgit rebase -p h u &&\n-\ttest_cmp_rev h HEAD~3 &&\n-\ttest_cmp_rev HEAD^2^ HEAD~2 &&\n-\ttest_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD\n-\"\n-\n-test_expect_success \"rebase -p --onto in merged history drops patches in upstream\" \"\n-\treset_rebase &&\n-\tgit rebase -p --onto f h u &&\n-\ttest_cmp_rev f HEAD~3 &&\n-\ttest_cmp_rev HEAD^2^ HEAD~2 &&\n-\ttest_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD\n-\"\n-\n-test_expect_success \"rebase -p --onto in merged history does not drop patches in onto\" \"\n-\treset_rebase &&\n-\tgit rebase -p --onto h f u &&\n-\ttest_cmp_rev h HEAD~3 &&\n-\ttest_cmp_rev HEAD^2~2 HEAD~2 &&\n-\ttest_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD\n-\"\n-\n-# a---b---c---g---h\n-# \\\n-# d---gp--s\n-# \\ \\ /\n-# \\ X\n-# \\ / \\\n-# e---t\n-#\n-# gp = cherry-picked g\n-# h = reverted g\n-test_expect_success 'setup of non-linear-history for dropping whole side' '\n-\tgit checkout gp &&\n-\ttest_merge s e &&\n-\tgit checkout e &&\n-\ttest_merge t gp\n-'\n-\n-test_expect_failure \"rebase -p drops merge commit when entire first-parent side is dropped\" \"\n-\treset_rebase &&\n-\tgit rebase -p h s &&\n-\ttest_cmp_rev h HEAD~2 &&\n-\ttest_linear_range 'd e' h..\n-\"\n-\n-test_expect_success \"rebase -p drops merge commit when entire second-parent side is dropped\" \"\n-\treset_rebase &&\n-\tgit rebase -p h t &&\n-\ttest_cmp_rev h HEAD~2 &&\n-\ttest_linear_range 'd e' h..\n-\"\n-\n-# a---b---c\n-# \\\n-# d---e\n-# \\ \\\n-# n---r\n-# \\\n-# o\n-#\n-# r = tree-same with n\n-test_expect_success 'setup of non-linear-history for empty commits' '\n-\tgit checkout n &&\n-\tgit merge --no-commit e &&\n-\tgit reset n . &&\n-\tgit commit -m r &&\n-\tgit reset --hard &&\n-\tgit clean -f &&\n-\tgit tag r\n-'\n-\n-test_expect_success \"rebase -p re-creates empty internal merge commit\" \"\n-\treset_rebase &&\n-\tgit rebase -p c r &&\n-\ttest_cmp_rev c HEAD~3 &&\n-\ttest_cmp_rev HEAD^2^ HEAD~2 &&\n-\ttest_revision_subjects 'd e n r' HEAD~2 HEAD^2 HEAD^ HEAD\n-\"\n-\n-test_expect_success \"rebase -p re-creates empty merge commit\" \"\n-\treset_rebase &&\n-\tgit rebase -p o r &&\n-\ttest_cmp_rev e HEAD^2 &&\n-\ttest_cmp_rev o HEAD^ &&\n-\ttest_revision_subjects 'r' HEAD\n-\"\n-\n test_done\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex bec48e6a1f..ffe385e493 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -66,25 +66,6 @@ test_expect_success 'setup' '\n \tgit commit -m \"Empty commit\" --allow-empty\n '\n \n-# FAILURE: Does not preserve master4.\n-test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '\n-\treset_rebase &&\n-\tgit checkout -b rebase-preserve-merges to-rebase &&\n-\tgit rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/master5\"\n-'\n-\n-# FAILURE: Does not preserve master4.\n-test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '\n-\treset_rebase &&\n-\tgit checkout -b rebase-keep-empty to-rebase &&\n-\tgit rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n-\tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n-'\n-\n test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-onto to-rebase &&\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 41b799e336..e5f679af33 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -461,15 +461,6 @@ test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success REBASE_P \\\n-\t'pull.rebase=preserve rebases and merges keep-merge' '\n-\tgit reset --hard before-preserve-rebase &&\n-\ttest_config pull.rebase preserve &&\n-\tgit pull . copy &&\n-\ttest \"$(git rev-parse HEAD^^)\" = \"$(git rev-parse copy)\" &&\n-\ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse keep-merge)\"\n-'\n-\n test_expect_success 'pull.rebase=interactive' '\n \twrite_script \"$TRASH_DIRECTORY/fake-editor\" <<-\\EOF &&\n \techo I was here >fake.out &&\n@@ -515,15 +506,6 @@ test_expect_success '--rebase=true rebases and flattens keep-merge' '\n \ttest file3 = \"$(git show HEAD:file3.t)\"\n '\n \n-test_expect_success REBASE_P \\\n-\t'--rebase=preserve rebases and merges keep-merge' '\n-\tgit reset --hard before-preserve-rebase &&\n-\ttest_config pull.rebase true &&\n-\tgit pull --rebase=preserve . copy &&\n-\ttest \"$(git rev-parse HEAD^^)\" = \"$(git rev-parse copy)\" &&\n-\ttest \"$(git rev-parse HEAD^2)\" = \"$(git rev-parse keep-merge)\"\n-'\n-\n test_expect_success '--rebase=invalid fails' '\n \tgit reset --hard before-preserve-rebase &&\n \t! git pull --rebase=invalid . copy\ndiff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh\nindex 94f85cdf83..1b4a7725fb 100755\n--- a/t/t7505-prepare-commit-msg-hook.sh\n+++ b/t/t7505-prepare-commit-msg-hook.sh\n@@ -247,7 +247,6 @@ test_rebase () {\n }\n \n test_rebase success\n-test_have_prereq !REBASE_P || test_rebase success -p\n \n test_expect_success 'with hook (cherry-pick)' '\n \ttest_when_finished \"git checkout -f master\" &&\ndiff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh\nindex b2401cec3e..0dec7f756b 100755\n--- a/t/t7517-per-repo-email.sh\n+++ b/t/t7517-per-repo-email.sh\n@@ -72,19 +72,6 @@ test_expect_success 'noop interactive rebase does not care about ident' '\n \tgit rebase -i HEAD^\n '\n \n-test_expect_success REBASE_P \\\n-\t'fast-forward rebase does not care about ident (preserve)' '\n-\tgit checkout -B tmp side-without-commit &&\n-\tgit rebase -p master\n-'\n-\n-test_expect_success REBASE_P \\\n-\t'non-fast-forward rebase refuses to write commits (preserve)' '\n-\ttest_when_finished \"git rebase --abort || true\" &&\n-\tgit checkout -B tmp side-with-commit &&\n-\ttest_must_fail git rebase -p master\n-'\n-\n test_expect_success 'author.name overrides user.name' '\n \ttest_config user.name user &&\n \ttest_config user.email user@example.com &&\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 46c4440843..0ef620f975 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -1634,7 +1634,3 @@ test_lazy_prereq CURL '\n test_lazy_prereq SHA1 '\n \ttest $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\n '\n-\n-test_lazy_prereq REBASE_P '\n-\ttest -z \"$GIT_TEST_SKIP_REBASE_P\"\n-'\n-- \ngitgitgadget\n\n"},{"id":"386920","messageId":"45fee72059d04d7770deb22ef605d6e26bbe762d.1574542243.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 8/8] remote: no longer claim that branch.*.rebase=preserve is a thing","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:42Z","receivedAt":"2019-11-23T20:50:55Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nSigned-off-by: Johannes Schindelin \n---\n builtin/remote.c | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/builtin/remote.c b/builtin/remote.c\nindex 3410ea19c7..afe9af09e9 100644\n--- a/builtin/remote.c\n+++ b/builtin/remote.c\n@@ -309,8 +309,6 @@ static int config_read_branches(const char *key, const char *value, void *cb)\n \t\t\tint v = git_parse_maybe_bool(value);\n \t\t\tif (v >= 0)\n \t\t\t\tinfo->rebase = v;\n-\t\t\telse if (!strcmp(value, \"preserve\"))\n-\t\t\t\tinfo->rebase = NORMAL_REBASE;\n \t\t\telse if (!strcmp(value, \"merges\"))\n \t\t\t\tinfo->rebase = REBASE_MERGES;\n \t\t\telse if (!strcmp(value, \"interactive\"))\n-- \ngitgitgadget\n"},{"id":"386922","messageId":"634e4141e9737835f758c28784d8cd452b0d12f9.1574542243.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 7/8] rebase: drop the internal `rebase--interactive` command","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:41Z","receivedAt":"2019-11-23T20:50:55Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIt was only used by the `--preserve-merges` backend, which we just\nremoved.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/rebase.c | 181 -----------------------------------------------\n git.c | 1 -\n 2 files changed, 182 deletions(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 2970a9ae47..69ec2da624 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -142,81 +142,6 @@ static const char *action_names[] = { \"undefined\",\n \t\t\t\t \"edit_todo\",\n \t\t\t\t \"show_current_patch\" };\n \n-static int add_exec_commands(struct string_list *commands)\n-{\n-\tconst char *todo_file = rebase_path_todo();\n-\tstruct todo_list todo_list = TODO_LIST_INIT;\n-\tint res;\n-\n-\tif (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)\n-\t\treturn error_errno(_(\"could not read '%s'.\"), todo_file);\n-\n-\tif (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,\n-\t\t\t\t\t&todo_list)) {\n-\t\ttodo_list_release(&todo_list);\n-\t\treturn error(_(\"unusable todo list: '%s'\"), todo_file);\n-\t}\n-\n-\ttodo_list_add_exec_commands(&todo_list, commands);\n-\tres = todo_list_write_to_file(the_repository, &todo_list,\n-\t\t\t\t todo_file, NULL, NULL, -1, 0);\n-\ttodo_list_release(&todo_list);\n-\n-\tif (res)\n-\t\treturn error_errno(_(\"could not write '%s'.\"), todo_file);\n-\treturn 0;\n-}\n-\n-static int rearrange_squash_in_todo_file(void)\n-{\n-\tconst char *todo_file = rebase_path_todo();\n-\tstruct todo_list todo_list = TODO_LIST_INIT;\n-\tint res = 0;\n-\n-\tif (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)\n-\t\treturn error_errno(_(\"could not read '%s'.\"), todo_file);\n-\tif (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,\n-\t\t\t\t\t&todo_list)) {\n-\t\ttodo_list_release(&todo_list);\n-\t\treturn error(_(\"unusable todo list: '%s'\"), todo_file);\n-\t}\n-\n-\tres = todo_list_rearrange_squash(&todo_list);\n-\tif (!res)\n-\t\tres = todo_list_write_to_file(the_repository, &todo_list,\n-\t\t\t\t\t todo_file, NULL, NULL, -1, 0);\n-\n-\ttodo_list_release(&todo_list);\n-\n-\tif (res)\n-\t\treturn error_errno(_(\"could not write '%s'.\"), todo_file);\n-\treturn 0;\n-}\n-\n-static int transform_todo_file(unsigned flags)\n-{\n-\tconst char *todo_file = rebase_path_todo();\n-\tstruct todo_list todo_list = TODO_LIST_INIT;\n-\tint res;\n-\n-\tif (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)\n-\t\treturn error_errno(_(\"could not read '%s'.\"), todo_file);\n-\n-\tif (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,\n-\t\t\t\t\t&todo_list)) {\n-\t\ttodo_list_release(&todo_list);\n-\t\treturn error(_(\"unusable todo list: '%s'\"), todo_file);\n-\t}\n-\n-\tres = todo_list_write_to_file(the_repository, &todo_list, todo_file,\n-\t\t\t\t NULL, NULL, -1, flags);\n-\ttodo_list_release(&todo_list);\n-\n-\tif (res)\n-\t\treturn error_errno(_(\"could not write '%s'.\"), todo_file);\n-\treturn 0;\n-}\n-\n static int edit_todo_file(unsigned flags)\n {\n \tconst char *todo_file = rebase_path_todo();\n@@ -408,24 +333,6 @@ static int run_rebase_interactive(struct rebase_options *opts,\n \n \t\tbreak;\n \t}\n-\tcase ACTION_SHORTEN_OIDS:\n-\tcase ACTION_EXPAND_OIDS:\n-\t\tret = transform_todo_file(flags);\n-\t\tbreak;\n-\tcase ACTION_CHECK_TODO_LIST:\n-\t\tret = check_todo_list_from_file(the_repository);\n-\t\tbreak;\n-\tcase ACTION_REARRANGE_SQUASH:\n-\t\tret = rearrange_squash_in_todo_file();\n-\t\tbreak;\n-\tcase ACTION_ADD_EXEC: {\n-\t\tstruct string_list commands = STRING_LIST_INIT_DUP;\n-\n-\t\tsplit_exec_commands(opts->cmd, &commands);\n-\t\tret = add_exec_commands(&commands);\n-\t\tstring_list_clear(&commands, 0);\n-\t\tbreak;\n-\t}\n \tdefault:\n \t\tBUG(\"invalid command '%d'\", command);\n \t}\n@@ -433,94 +340,6 @@ static int run_rebase_interactive(struct rebase_options *opts,\n \treturn ret;\n }\n \n-static const char * const builtin_rebase_interactive_usage[] = {\n-\tN_(\"git rebase--interactive []\"),\n-\tNULL\n-};\n-\n-int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)\n-{\n-\tstruct rebase_options opts = REBASE_OPTIONS_INIT;\n-\tstruct object_id squash_onto = null_oid;\n-\tenum action command = ACTION_NONE;\n-\tstruct option options[] = {\n-\t\tOPT_NEGBIT(0, \"ff\", &opts.flags, N_(\"allow fast-forward\"),\n-\t\t\t REBASE_FORCE),\n-\t\tOPT_BOOL(0, \"keep-empty\", &opts.keep_empty, N_(\"keep empty commits\")),\n-\t\tOPT_BOOL(0, \"allow-empty-message\", &opts.allow_empty_message,\n-\t\t\t N_(\"allow commits with empty messages\")),\n-\t\tOPT_BOOL(0, \"rebase-merges\", &opts.rebase_merges, N_(\"rebase merge commits\")),\n-\t\tOPT_BOOL(0, \"rebase-cousins\", &opts.rebase_cousins,\n-\t\t\t N_(\"keep original branch points of cousins\")),\n-\t\tOPT_BOOL(0, \"autosquash\", &opts.autosquash,\n-\t\t\t N_(\"move commits that begin with squash!/fixup!\")),\n-\t\tOPT_BOOL(0, \"signoff\", &opts.signoff, N_(\"sign commits\")),\n-\t\tOPT_BIT('v', \"verbose\", &opts.flags,\n-\t\t\tN_(\"display a diffstat of what changed upstream\"),\n-\t\t\tREBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),\n-\t\tOPT_CMDMODE(0, \"continue\", &command, N_(\"continue rebase\"),\n-\t\t\t ACTION_CONTINUE),\n-\t\tOPT_CMDMODE(0, \"skip\", &command, N_(\"skip commit\"), ACTION_SKIP),\n-\t\tOPT_CMDMODE(0, \"edit-todo\", &command, N_(\"edit the todo list\"),\n-\t\t\t ACTION_EDIT_TODO),\n-\t\tOPT_CMDMODE(0, \"show-current-patch\", &command, N_(\"show the current patch\"),\n-\t\t\t ACTION_SHOW_CURRENT_PATCH),\n-\t\tOPT_CMDMODE(0, \"shorten-ids\", &command,\n-\t\t\tN_(\"shorten commit ids in the todo list\"), ACTION_SHORTEN_OIDS),\n-\t\tOPT_CMDMODE(0, \"expand-ids\", &command,\n-\t\t\tN_(\"expand commit ids in the todo list\"), ACTION_EXPAND_OIDS),\n-\t\tOPT_CMDMODE(0, \"check-todo-list\", &command,\n-\t\t\tN_(\"check the todo list\"), ACTION_CHECK_TODO_LIST),\n-\t\tOPT_CMDMODE(0, \"rearrange-squash\", &command,\n-\t\t\tN_(\"rearrange fixup/squash lines\"), ACTION_REARRANGE_SQUASH),\n-\t\tOPT_CMDMODE(0, \"add-exec-commands\", &command,\n-\t\t\tN_(\"insert exec commands in todo list\"), ACTION_ADD_EXEC),\n-\t\t{ OPTION_CALLBACK, 0, \"onto\", &opts.onto, N_(\"onto\"), N_(\"onto\"),\n-\t\t PARSE_OPT_NONEG, parse_opt_commit, 0 },\n-\t\t{ OPTION_CALLBACK, 0, \"restrict-revision\", &opts.restrict_revision,\n-\t\t N_(\"restrict-revision\"), N_(\"restrict revision\"),\n-\t\t PARSE_OPT_NONEG, parse_opt_commit, 0 },\n-\t\t{ OPTION_CALLBACK, 0, \"squash-onto\", &squash_onto, N_(\"squash-onto\"),\n-\t\t N_(\"squash onto\"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },\n-\t\t{ OPTION_CALLBACK, 0, \"upstream\", &opts.upstream, N_(\"upstream\"),\n-\t\t N_(\"the upstream commit\"), PARSE_OPT_NONEG, parse_opt_commit,\n-\t\t 0 },\n-\t\tOPT_STRING(0, \"head-name\", &opts.head_name, N_(\"head-name\"), N_(\"head name\")),\n-\t\t{ OPTION_STRING, 'S', \"gpg-sign\", &opts.gpg_sign_opt, N_(\"key-id\"),\n-\t\t\tN_(\"GPG-sign commits\"),\n-\t\t\tPARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n-\t\tOPT_STRING(0, \"strategy\", &opts.strategy, N_(\"strategy\"),\n-\t\t\t N_(\"rebase strategy\")),\n-\t\tOPT_STRING(0, \"strategy-opts\", &opts.strategy_opts, N_(\"strategy-opts\"),\n-\t\t\t N_(\"strategy options\")),\n-\t\tOPT_STRING(0, \"switch-to\", &opts.switch_to, N_(\"switch-to\"),\n-\t\t\t N_(\"the branch or commit to checkout\")),\n-\t\tOPT_STRING(0, \"onto-name\", &opts.onto_name, N_(\"onto-name\"), N_(\"onto name\")),\n-\t\tOPT_STRING(0, \"cmd\", &opts.cmd, N_(\"cmd\"), N_(\"the command to run\")),\n-\t\tOPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),\n-\t\tOPT_BOOL(0, \"reschedule-failed-exec\", &opts.reschedule_failed_exec,\n-\t\t\t N_(\"automatically re-schedule any `exec` that fails\")),\n-\t\tOPT_END()\n-\t};\n-\n-\topts.rebase_cousins = -1;\n-\n-\tif (argc == 1)\n-\t\tusage_with_options(builtin_rebase_interactive_usage, options);\n-\n-\targc = parse_options(argc, argv, prefix, options,\n-\t\t\tbuiltin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);\n-\n-\tif (!is_null_oid(&squash_onto))\n-\t\topts.squash_onto = &squash_onto;\n-\n-\tif (opts.rebase_cousins >= 0 && !opts.rebase_merges)\n-\t\twarning(_(\"--[no-]rebase-cousins has no effect without \"\n-\t\t\t \"--rebase-merges\"));\n-\n-\treturn !!run_rebase_interactive(&opts, command);\n-}\n-\n static int is_interactive(struct rebase_options *opts)\n {\n \treturn opts->type == REBASE_INTERACTIVE;\ndiff --git a/git.c b/git.c\nindex ce6ab0ece2..015e155dcd 100644\n--- a/git.c\n+++ b/git.c\n@@ -551,7 +551,6 @@ static struct cmd_struct commands[] = {\n \t{ \"range-diff\", cmd_range_diff, RUN_SETUP | USE_PAGER },\n \t{ \"read-tree\", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},\n \t{ \"rebase\", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },\n-\t{ \"rebase--interactive\", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },\n \t{ \"receive-pack\", cmd_receive_pack },\n \t{ \"reflog\", cmd_reflog, RUN_SETUP },\n \t{ \"remote\", cmd_remote, RUN_SETUP },\n-- \ngitgitgadget\n\n"},{"id":"386923","messageId":"14e242b3cf994159382045fd3623ddb80cbe96ab.1574542243.git.gitgitgadget@gmail.com","threadId":"52325","inReplyTo":"pull.195.git.1574542242.gitgitgadget@gmail.com","subject":"[PATCH 5/8] rebase: drop support for `--preserve-merges`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-23T20:50:39Z","receivedAt":"2019-11-23T20:50:58Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis option was deprecated in favor of `--rebase-merges` some time ago,\nand now we retire it.\n\nSigned-off-by: Johannes Schindelin \n---\n .gitignore | 1 -\n Documentation/git-rebase.txt | 47 --\n Makefile | 2 -\n builtin/rebase.c | 135 +---\n git-rebase--preserve-merges.sh | 1067 --------------------------------\n 5 files changed, 6 insertions(+), 1246 deletions(-)\n delete mode 100644 git-rebase--preserve-merges.sh\n\ndiff --git a/.gitignore b/.gitignore\nindex 89b3b79c1a..9989dce1d2 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -123,7 +123,6 @@\n /git-range-diff\n /git-read-tree\n /git-rebase\n-/git-rebase--preserve-merges\n /git-receive-pack\n /git-reflog\n /git-remote\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 639a4179d1..7cced2f272 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -442,29 +442,12 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s\n the `rebase-cousins` mode is turned on, such commits are instead rebased\n onto `` (or ``, if specified).\n +\n-The `--rebase-merges` mode is similar in spirit to the deprecated\n-`--preserve-merges`, but in contrast to that option works well in interactive\n-rebases: commits can be reordered, inserted and dropped at will.\n-+\n It is currently only possible to recreate the merge commits using the\n `recursive` merge strategy; Different merge strategies can be used only via\n explicit `exec git merge -s [...]` commands.\n +\n See also REBASING MERGES and INCOMPATIBLE OPTIONS below.\n \n--p::\n---preserve-merges::\n-\t[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits\n-\tinstead of flattening the history by replaying commits a merge commit\n-\tintroduces. Merge conflict resolutions or manual amendments to merge\n-\tcommits are not preserved.\n-+\n-This uses the `--interactive` machinery internally, but combining it\n-with the `--interactive` option explicitly is generally not a good\n-idea unless you know what you are doing (see BUGS below).\n-+\n-See also INCOMPATIBLE OPTIONS below.\n-\n -x ::\n --exec ::\n \tAppend \"exec \" after each line creating a commit in the\n@@ -496,9 +479,6 @@ See also INCOMPATIBLE OPTIONS below.\n \tthe root commit(s) on a branch. When used with --onto, it\n \twill skip changes already contained in (instead of\n \t) whereas without --onto it will operate on every change.\n-\tWhen used together with both --onto and --preserve-merges,\n-\t'all' root commits will be rewritten to have as parent\n-\tinstead.\n +\n See also INCOMPATIBLE OPTIONS below.\n \n@@ -553,7 +533,6 @@ are incompatible with the following options:\n * --allow-empty-message\n * --[no-]autosquash\n * --rebase-merges\n- * --preserve-merges\n * --interactive\n * --exec\n * --keep-empty\n@@ -562,9 +541,6 @@ are incompatible with the following options:\n \n In addition, the following pairs of options are incompatible:\n \n- * --preserve-merges and --interactive\n- * --preserve-merges and --signoff\n- * --preserve-merges and --rebase-merges\n * --keep-base and --onto\n * --keep-base and --root\n \n@@ -1048,29 +1024,6 @@ merge tlsv1.3\n merge cmake\n ------------\n \n-BUGS\n-----\n-The todo list presented by the deprecated `--preserve-merges --interactive`\n-does not represent the topology of the revision graph (use `--rebase-merges`\n-instead). Editing commits and rewording their commit messages should work\n-fine, but attempts to reorder commits tend to produce counterintuitive results.\n-Use `--rebase-merges` in such scenarios instead.\n-\n-For example, an attempt to rearrange\n-------------\n-1 --- 2 --- 3 --- 4 --- 5\n-------------\n-to\n-------------\n-1 --- 2 --- 4 --- 3 --- 5\n-------------\n-by moving the \"pick 4\" line will result in the following history:\n-------------\n-\t3\n- /\n-1 --- 2 --- 4 --- 5\n-------------\n-\n GIT\n ---\n Part of the linkgit:git[1] suite\ndiff --git a/Makefile b/Makefile\nindex 58b92af54b..e2c26843e2 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -616,7 +616,6 @@ SCRIPT_SH += git-web--browse.sh\n \n SCRIPT_LIB += git-mergetool--lib\n SCRIPT_LIB += git-parse-remote\n-SCRIPT_LIB += git-rebase--preserve-merges\n SCRIPT_LIB += git-sh-setup\n SCRIPT_LIB += git-sh-i18n\n \n@@ -2522,7 +2521,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \\\n LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)\n LOCALIZED_SH = $(SCRIPT_SH)\n LOCALIZED_SH += git-parse-remote.sh\n-LOCALIZED_SH += git-rebase--preserve-merges.sh\n LOCALIZED_SH += git-sh-setup.sh\n LOCALIZED_PERL = $(SCRIPT_PERL)\n \ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex e755087b0f..2970a9ae47 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -46,8 +46,7 @@ enum rebase_type {\n \tREBASE_UNSPECIFIED = -1,\n \tREBASE_AM,\n \tREBASE_MERGE,\n-\tREBASE_INTERACTIVE,\n-\tREBASE_PRESERVE_MERGES\n+\tREBASE_INTERACTIVE\n };\n \n struct rebase_options {\n@@ -524,8 +523,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)\n \n static int is_interactive(struct rebase_options *opts)\n {\n-\treturn opts->type == REBASE_INTERACTIVE ||\n-\t\topts->type == REBASE_PRESERVE_MERGES;\n+\treturn opts->type == REBASE_INTERACTIVE;\n }\n \n static void imply_interactive(struct rebase_options *opts, const char *option)\n@@ -535,7 +533,6 @@ static void imply_interactive(struct rebase_options *opts, const char *option)\n \t\tdie(_(\"%s requires an interactive rebase\"), option);\n \t\tbreak;\n \tcase REBASE_INTERACTIVE:\n-\tcase REBASE_PRESERVE_MERGES:\n \t\tbreak;\n \tcase REBASE_MERGE:\n \t\t/* we now implement --merge via --interactive */\n@@ -776,17 +773,6 @@ static struct commit *peel_committish(const char *name)\n \treturn (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);\n }\n \n-static void add_var(struct strbuf *buf, const char *name, const char *value)\n-{\n-\tif (!value)\n-\t\tstrbuf_addf(buf, \"unset %s; \", name);\n-\telse {\n-\t\tstrbuf_addf(buf, \"%s=\", name);\n-\t\tsq_quote_buf(buf, value);\n-\t\tstrbuf_addstr(buf, \"; \");\n-\t}\n-}\n-\n #define GIT_REFLOG_ACTION_ENVIRONMENT \"GIT_REFLOG_ACTION\"\n \n #define RESET_HEAD_DETACH (1<<0)\n@@ -1076,10 +1062,8 @@ static int run_am(struct rebase_options *opts)\n \n static int run_specific_rebase(struct rebase_options *opts, enum action action)\n {\n-\tconst char *argv[] = { NULL, NULL };\n-\tstruct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;\n+\tstruct strbuf script_snippet = STRBUF_INIT;\n \tint status;\n-\tconst char *backend, *backend_func;\n \n \tif (opts->type == REBASE_INTERACTIVE) {\n \t\t/* Run builtin interactive rebase */\n@@ -1096,89 +1080,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)\n \t\t}\n \n \t\tstatus = run_rebase_interactive(opts, action);\n-\t\tgoto finished_rebase;\n-\t}\n-\n-\tif (opts->type == REBASE_AM) {\n+\t} else if (opts->type == REBASE_AM)\n \t\tstatus = run_am(opts);\n-\t\tgoto finished_rebase;\n-\t}\n-\n-\tadd_var(&script_snippet, \"GIT_DIR\", absolute_path(get_git_dir()));\n-\tadd_var(&script_snippet, \"state_dir\", opts->state_dir);\n-\n-\tadd_var(&script_snippet, \"upstream_name\", opts->upstream_name);\n-\tadd_var(&script_snippet, \"upstream\", opts->upstream ?\n-\t\toid_to_hex(&opts->upstream->object.oid) : NULL);\n-\tadd_var(&script_snippet, \"head_name\",\n-\t\topts->head_name ? opts->head_name : \"detached HEAD\");\n-\tadd_var(&script_snippet, \"orig_head\", oid_to_hex(&opts->orig_head));\n-\tadd_var(&script_snippet, \"onto\", opts->onto ?\n-\t\toid_to_hex(&opts->onto->object.oid) : NULL);\n-\tadd_var(&script_snippet, \"onto_name\", opts->onto_name);\n-\tadd_var(&script_snippet, \"revisions\", opts->revisions);\n-\tadd_var(&script_snippet, \"restrict_revision\", opts->restrict_revision ?\n-\t\toid_to_hex(&opts->restrict_revision->object.oid) : NULL);\n-\tadd_var(&script_snippet, \"GIT_QUIET\",\n-\t\topts->flags & REBASE_NO_QUIET ? \"\" : \"t\");\n-\tsq_quote_argv_pretty(&buf, opts->git_am_opts.argv);\n-\tadd_var(&script_snippet, \"git_am_opt\", buf.buf);\n-\tstrbuf_release(&buf);\n-\tadd_var(&script_snippet, \"verbose\",\n-\t\topts->flags & REBASE_VERBOSE ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"diffstat\",\n-\t\topts->flags & REBASE_DIFFSTAT ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"force_rebase\",\n-\t\topts->flags & REBASE_FORCE ? \"t\" : \"\");\n-\tif (opts->switch_to)\n-\t\tadd_var(&script_snippet, \"switch_to\", opts->switch_to);\n-\tadd_var(&script_snippet, \"action\", opts->action ? opts->action : \"\");\n-\tadd_var(&script_snippet, \"signoff\", opts->signoff ? \"--signoff\" : \"\");\n-\tadd_var(&script_snippet, \"allow_rerere_autoupdate\",\n-\t\topts->allow_rerere_autoupdate ?\n-\t\t\topts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?\n-\t\t\t\"--rerere-autoupdate\" : \"--no-rerere-autoupdate\" : \"\");\n-\tadd_var(&script_snippet, \"keep_empty\", opts->keep_empty ? \"yes\" : \"\");\n-\tadd_var(&script_snippet, \"autosquash\", opts->autosquash ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"gpg_sign_opt\", opts->gpg_sign_opt);\n-\tadd_var(&script_snippet, \"cmd\", opts->cmd);\n-\tadd_var(&script_snippet, \"allow_empty_message\",\n-\t\topts->allow_empty_message ? \"--allow-empty-message\" : \"\");\n-\tadd_var(&script_snippet, \"rebase_merges\",\n-\t\topts->rebase_merges ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"rebase_cousins\",\n-\t\topts->rebase_cousins ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"strategy\", opts->strategy);\n-\tadd_var(&script_snippet, \"strategy_opts\", opts->strategy_opts);\n-\tadd_var(&script_snippet, \"rebase_root\", opts->root ? \"t\" : \"\");\n-\tadd_var(&script_snippet, \"squash_onto\",\n-\t\topts->squash_onto ? oid_to_hex(opts->squash_onto) : \"\");\n-\tadd_var(&script_snippet, \"git_format_patch_opt\",\n-\t\topts->git_format_patch_opt.buf);\n-\n-\tif (is_interactive(opts) &&\n-\t !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {\n-\t\tstrbuf_addstr(&script_snippet,\n-\t\t\t \"GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; \");\n-\t\topts->autosquash = 0;\n-\t}\n-\n-\tswitch (opts->type) {\n-\tcase REBASE_PRESERVE_MERGES:\n-\t\tbackend = \"git-rebase--preserve-merges\";\n-\t\tbackend_func = \"git_rebase__preserve_merges\";\n-\t\tbreak;\n-\tdefault:\n+\telse\n \t\tBUG(\"Unhandled rebase type %d\", opts->type);\n-\t\tbreak;\n-\t}\n \n-\tstrbuf_addf(&script_snippet,\n-\t\t \". git-sh-setup && . %s && %s\", backend, backend_func);\n-\targv[0] = script_snippet.buf;\n-\n-\tstatus = run_command_v_opt(argv, RUN_USING_SHELL);\n-finished_rebase:\n \tif (opts->dont_finish_rebase)\n \t\t; /* do nothing */\n \telse if (opts->type == REBASE_INTERACTIVE)\n@@ -1471,10 +1377,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\tN_(\"let the user edit the list of commits to rebase\"),\n \t\t\tPARSE_OPT_NOARG | PARSE_OPT_NONEG,\n \t\t\tparse_opt_interactive },\n-\t\tOPT_SET_INT_F('p', \"preserve-merges\", &options.type,\n-\t\t\t N_(\"(DEPRECATED) try to recreate merges instead of \"\n-\t\t\t\t \"ignoring them\"),\n-\t\t\t REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),\n \t\tOPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),\n \t\tOPT_BOOL('k', \"keep-empty\", &options.keep_empty,\n \t\t\t N_(\"preserve empty commits during rebase\")),\n@@ -1537,8 +1439,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\tstrbuf_reset(&buf);\n \t\tstrbuf_addf(&buf, \"%s/rewritten\", merge_dir());\n \t\tif (is_directory(buf.buf)) {\n-\t\t\toptions.type = REBASE_PRESERVE_MERGES;\n-\t\t\toptions.flags |= REBASE_INTERACTIVE_EXPLICIT;\n+\t\t\tdie(\"`rebase -p` is no longer supported\");\n \t\t} else {\n \t\t\tstrbuf_reset(&buf);\n \t\t\tstrbuf_addf(&buf, \"%s/interactive\", merge_dir());\n@@ -1568,10 +1469,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\tusage_with_options(builtin_rebase_usage,\n \t\t\t\t builtin_rebase_options);\n \n-\tif (options.type == REBASE_PRESERVE_MERGES)\n-\t\twarning(_(\"git rebase --preserve-merges is deprecated. \"\n-\t\t\t \"Use --rebase-merges instead.\"));\n-\n \tif (keep_base) {\n \t\tif (options.onto_name)\n \t\t\tdie(_(\"cannot combine '--keep-base' with '--onto'\"));\n@@ -1789,7 +1686,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\tdie(_(\"--strategy requires --merge or --interactive\"));\n \t\tcase REBASE_MERGE:\n \t\tcase REBASE_INTERACTIVE:\n-\t\tcase REBASE_PRESERVE_MERGES:\n \t\t\t/* compatible */\n \t\t\tbreak;\n \t\tcase REBASE_UNSPECIFIED:\n@@ -1812,7 +1708,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \tswitch (options.type) {\n \tcase REBASE_MERGE:\n \tcase REBASE_INTERACTIVE:\n-\tcase REBASE_PRESERVE_MERGES:\n \t\toptions.state_dir = merge_dir();\n \t\tbreak;\n \tcase REBASE_AM:\n@@ -1843,28 +1738,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (options.signoff) {\n-\t\tif (options.type == REBASE_PRESERVE_MERGES)\n-\t\t\tdie(\"cannot combine '--signoff' with \"\n-\t\t\t \"'--preserve-merges'\");\n \t\targv_array_push(&options.git_am_opts, \"--signoff\");\n \t\toptions.flags |= REBASE_FORCE;\n \t}\n \n-\tif (options.type == REBASE_PRESERVE_MERGES) {\n-\t\t/*\n-\t\t * Note: incompatibility with --signoff handled in signoff block above\n-\t\t * Note: incompatibility with --interactive is just a strong warning;\n-\t\t * git-rebase.txt caveats with \"unless you know what you are doing\"\n-\t\t */\n-\t\tif (options.rebase_merges)\n-\t\t\tdie(_(\"cannot combine '--preserve-merges' with \"\n-\t\t\t \"'--rebase-merges'\"));\n-\n-\t\tif (options.reschedule_failed_exec)\n-\t\t\tdie(_(\"error: cannot combine '--preserve-merges' with \"\n-\t\t\t \"'--reschedule-failed-exec'\"));\n-\t}\n-\n \tif (!options.root) {\n \t\tif (argc < 1) {\n \t\t\tstruct branch *branch;\ndiff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh\ndeleted file mode 100644\nindex dec90e9af6..0000000000\n--- a/git-rebase--preserve-merges.sh\n+++ /dev/null\n@@ -1,1067 +0,0 @@\n-# This shell script fragment is sourced by git-rebase to implement its\n-# preserve-merges mode.\n-#\n-# Copyright (c) 2006 Johannes E. Schindelin\n-#\n-# The file containing rebase commands, comments, and empty lines.\n-# This file is created by \"git rebase -i\" then edited by the user. As\n-# the lines are processed, they are removed from the front of this\n-# file and written to the tail of $done.\n-todo=\"$state_dir\"/git-rebase-todo\n-\n-# The rebase command lines that have already been processed. A line\n-# is moved here when it is first handled, before any associated user\n-# actions.\n-done=\"$state_dir\"/done\n-\n-# The commit message that is planned to be used for any changes that\n-# need to be committed following a user interaction.\n-msg=\"$state_dir\"/message\n-\n-# The file into which is accumulated the suggested commit message for\n-# squash/fixup commands. When the first of a series of squash/fixups\n-# is seen, the file is created and the commit message from the\n-# previous commit and from the first squash/fixup commit are written\n-# to it. The commit message for each subsequent squash/fixup commit\n-# is appended to the file as it is processed.\n-#\n-# The first line of the file is of the form\n-# # This is a combination of $count commits.\n-# where $count is the number of commits whose messages have been\n-# written to the file so far (including the initial \"pick\" commit).\n-# Each time that a commit message is processed, this line is read and\n-# updated. It is deleted just before the combined commit is made.\n-squash_msg=\"$state_dir\"/message-squash\n-\n-# If the current series of squash/fixups has not yet included a squash\n-# command, then this file exists and holds the commit message of the\n-# original \"pick\" commit. (If the series ends without a \"squash\"\n-# command, then this can be used as the commit message of the combined\n-# commit without opening the editor.)\n-fixup_msg=\"$state_dir\"/message-fixup\n-\n-# $rewritten is the name of a directory containing files for each\n-# commit that is reachable by at least one merge base of $head and\n-# $upstream. They are not necessarily rewritten, but their children\n-# might be. This ensures that commits on merged, but otherwise\n-# unrelated side branches are left alone. (Think \"X\" in the man page's\n-# example.)\n-rewritten=\"$state_dir\"/rewritten\n-\n-dropped=\"$state_dir\"/dropped\n-\n-end=\"$state_dir\"/end\n-msgnum=\"$state_dir\"/msgnum\n-\n-# A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and\n-# GIT_AUTHOR_DATE that will be used for the commit that is currently\n-# being rebased.\n-author_script=\"$state_dir\"/author-script\n-\n-# When an \"edit\" rebase command is being processed, the SHA1 of the\n-# commit to be edited is recorded in this file. When \"git rebase\n-# --continue\" is executed, if there are any staged changes then they\n-# will be amended to the HEAD commit, but only provided the HEAD\n-# commit is still the commit to be edited. When any other rebase\n-# command is processed, this file is deleted.\n-amend=\"$state_dir\"/amend\n-\n-# For the post-rewrite hook, we make a list of rewritten commits and\n-# their new sha1s. The rewritten-pending list keeps the sha1s of\n-# commits that have been processed, but not committed yet,\n-# e.g. because they are waiting for a 'squash' command.\n-rewritten_list=\"$state_dir\"/rewritten-list\n-rewritten_pending=\"$state_dir\"/rewritten-pending\n-\n-# Work around Git for Windows' Bash whose \"read\" does not strip CRLF\n-# and leaves CR at the end instead.\n-cr=$(printf \"\\015\")\n-\n-resolvemsg=\"\n-$(gettext 'Resolve all conflicts manually, mark them as resolved with\n-\"git add/rm \", then run \"git rebase --continue\".\n-You can instead skip this commit: run \"git rebase --skip\".\n-To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".')\n-\"\n-\n-write_basic_state () {\n-\techo \"$head_name\" > \"$state_dir\"/head-name &&\n-\techo \"$onto\" > \"$state_dir\"/onto &&\n-\techo \"$orig_head\" > \"$state_dir\"/orig-head &&\n-\ttest t = \"$GIT_QUIET\" && : > \"$state_dir\"/quiet\n-\ttest t = \"$verbose\" && : > \"$state_dir\"/verbose\n-\ttest -n \"$strategy\" && echo \"$strategy\" > \"$state_dir\"/strategy\n-\ttest -n \"$strategy_opts\" && echo \"$strategy_opts\" > \\\n-\t\t\"$state_dir\"/strategy_opts\n-\ttest -n \"$allow_rerere_autoupdate\" && echo \"$allow_rerere_autoupdate\" > \\\n-\t\t\"$state_dir\"/allow_rerere_autoupdate\n-\ttest -n \"$gpg_sign_opt\" && echo \"$gpg_sign_opt\" > \"$state_dir\"/gpg_sign_opt\n-\ttest -n \"$signoff\" && echo \"$signoff\" >\"$state_dir\"/signoff\n-\ttest -n \"$reschedule_failed_exec\" && : > \"$state_dir\"/reschedule-failed-exec\n-}\n-\n-apply_autostash () {\n-\tif test -f \"$state_dir/autostash\"\n-\tthen\n-\t\tstash_sha1=$(cat \"$state_dir/autostash\")\n-\t\tif git stash apply $stash_sha1 >/dev/null 2>&1\n-\t\tthen\n-\t\t\techo \"$(gettext 'Applied autostash.')\" >&2\n-\t\telse\n-\t\t\tgit stash store -m \"autostash\" -q $stash_sha1 ||\n-\t\t\tdie \"$(eval_gettext \"Cannot store \\$stash_sha1\")\"\n-\t\t\tgettext 'Applying autostash resulted in conflicts.\n-Your changes are safe in the stash.\n-You can run \"git stash pop\" or \"git stash drop\" at any time.\n-' >&2\n-\t\tfi\n-\tfi\n-}\n-\n-output () {\n-\tcase \"$verbose\" in\n-\t'')\n-\t\toutput=$(\"$@\" 2>&1 )\n-\t\tstatus=$?\n-\t\ttest $status != 0 && printf \"%s\\n\" \"$output\"\n-\t\treturn $status\n-\t\t;;\n-\t*)\n-\t\t\"$@\"\n-\t\t;;\n-\tesac\n-}\n-\n-strategy_args=${strategy:+--strategy=$strategy}\n-test -n \"$strategy_opts\" &&\n-eval '\n-\tfor strategy_opt in '\"$strategy_opts\"'\n-\tdo\n-\t\tstrategy_args=\"$strategy_args -X$(git rev-parse --sq-quote \"${strategy_opt#--}\")\"\n-\tdone\n-'\n-\n-GIT_CHERRY_PICK_HELP=\"$resolvemsg\"\n-export GIT_CHERRY_PICK_HELP\n-\n-comment_char=$(git config --get core.commentchar 2>/dev/null)\n-case \"$comment_char\" in\n-'' | auto)\n-\tcomment_char=\"#\"\n-\t;;\n-?)\n-\t;;\n-*)\n-\tcomment_char=$(echo \"$comment_char\" | cut -c1)\n-\t;;\n-esac\n-\n-warn () {\n-\tprintf '%s\\n' \"$*\" >&2\n-}\n-\n-# Output the commit message for the specified commit.\n-commit_message () {\n-\tgit cat-file commit \"$1\" | sed \"1,/^$/d\"\n-}\n-\n-orig_reflog_action=\"$GIT_REFLOG_ACTION\"\n-\n-comment_for_reflog () {\n-\tcase \"$orig_reflog_action\" in\n-\t''|rebase*)\n-\t\tGIT_REFLOG_ACTION=\"rebase -i ($1)\"\n-\t\texport GIT_REFLOG_ACTION\n-\t\t;;\n-\tesac\n-}\n-\n-last_count=\n-mark_action_done () {\n-\tsed -e 1q < \"$todo\" >> \"$done\"\n-\tsed -e 1d < \"$todo\" >> \"$todo\".new\n-\tmv -f \"$todo\".new \"$todo\"\n-\tnew_count=$(( $(git stripspace --strip-comments <\"$done\" | wc -l) ))\n-\techo $new_count >\"$msgnum\"\n-\ttotal=$(($new_count + $(git stripspace --strip-comments <\"$todo\" | wc -l)))\n-\techo $total >\"$end\"\n-\tif test \"$last_count\" != \"$new_count\"\n-\tthen\n-\t\tlast_count=$new_count\n-\t\teval_gettext \"Rebasing (\\$new_count/\\$total)\"; printf \"\\r\"\n-\t\ttest -z \"$verbose\" || echo\n-\tfi\n-}\n-\n-# Put the last action marked done at the beginning of the todo list\n-# again. If there has not been an action marked done yet, leave the list of\n-# items on the todo list unchanged.\n-reschedule_last_action () {\n-\ttail -n 1 \"$done\" | cat - \"$todo\" >\"$todo\".new\n-\tsed -e \\$d <\"$done\" >\"$done\".new\n-\tmv -f \"$todo\".new \"$todo\"\n-\tmv -f \"$done\".new \"$done\"\n-}\n-\n-append_todo_help () {\n-\tgettext \"\n-Commands:\n-p, pick = use commit\n-r, reword = use commit, but edit the commit message\n-e, edit = use commit, but stop for amending\n-s, squash = use commit, but meld into previous commit\n-f, fixup = like \\\"squash\\\", but discard this commit's log message\n-x, exec = run command (the rest of the line) using shell\n-d, drop = remove commit\n-l, label