Drop support for git rebase --preserve-merges

In 427c3bd28ab (rebase: deprecate --preserve-merges, 2019-03-11) (which was included in v2.22.0), we officially deprecated the --preserve-merges backend. This patch series drops that deprecated backend. Maybe we want to make that happen around v2.26.0?

Note: this patch series is based on js/git-svn-use-rebase-merges

Johannes Schindelin (8):
t5520: do not use pull.rebase=preserve
remote: warn about unhandled branch.<name>.rebase values
tests: stop testing git rebase --preserve-merges
pull: remove support for --rebase=preserve
rebase: drop support for --preserve-merges
git-svn: drop support for --preserve-merges
rebase: drop the internal rebase--interactive command
remote: no longer claim that branch.*.rebase=preserve is a thing

 .gitignore                                |    1 -
 Documentation/config/branch.txt           |    4 -
 Documentation/config/pull.txt             |    4 -
 Documentation/git-pull.txt                |    6 +-
 Documentation/git-rebase.txt              |   47 -
 Documentation/git-svn.txt                 |    1 -
 Makefile                                  |    2 -
 azure-pipelines.yml                       |    2 -
 builtin/pull.c                            |   12 +-
 builtin/rebase.c                          |  316 +-----
 builtin/remote.c                          |    5 +-
 contrib/completion/git-completion.bash    |    2 +-
 git-rebase--preserve-merges.sh            | 1067 ---------------------
 git-svn.perl                              |    1 -
 git.c                                     |    1 -
 t/t3404-rebase-interactive.sh             |   76 --
 t/t3408-rebase-multi-line.sh              |   10 -
 t/t3409-rebase-preserve-merges.sh         |  127 ---
 t/t3410-rebase-preserve-dropped-merges.sh |   90 --
 t/t3411-rebase-preserve-around-merges.sh  |   80 --
 t/t3412-rebase-root.sh                    |   37 -
 t/t3414-rebase-preserve-onto.sh           |   85 --
 t/t3418-rebase-continue.sh                |   15 -
 t/t3421-rebase-topology-linear.sh         |   19 -
 t/t3422-rebase-incompatible-options.sh    |   11 -
 t/t3425-rebase-topology-merges.sh         |  151 ---
 t/t3427-rebase-subtree.sh                 |   19 -
 t/t5520-pull.sh                           |   24 +-
 t/t7505-prepare-commit-msg-hook.sh        |    1 -
 t/t7517-per-repo-email.sh                 |   13 -
 t/test-lib.sh                             |    4 -
 31 files changed, 17 insertions(+), 2216 deletions(-)
 delete mode 100644 git-rebase--preserve-merges.sh
 delete mode 100755 t/t3409-rebase-preserve-merges.sh
 delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh
 delete mode 100755 t/t3411-rebase-preserve-around-merges.sh
 delete mode 100755 t/t3414-rebase-preserve-onto.sh

base-commit: ea8b7be1476a2301e3658a8e626b69c9d7f540bd
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-195%2Fdscho%2Fdrop-rebase-p-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-195/dscho/drop-rebase-p-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/195

gitgitgadget

From: Johannes Schindelin <[email protected]>

Even if those tests try to override that setting, let's not use it because it is deprecated: let's use merges instead.

---
 t/t5520-pull.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

index cf4cc32fd0..41b799e336 100755
@@ -509,7 +509,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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 	test file3 = "$(git show HEAD:file3.t)"

@@ -529,9 +529,9 @@ test_expect_success '--rebase=invalid fails' '
 	! 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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 	test file3 = "$(git show HEAD:file3.t)"

gitgitgadget

From: Johannes Schindelin <[email protected]>

We ignore them silently, but it actually makes sense to warn the users that their config setting has no effect.

---
 builtin/remote.c | 3 +++
 1 file changed, 3 insertions(+)

index 5591cef775..3410ea19c7 100644
@@ -315,6 +315,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 				info->rebase = REBASE_MERGES;
 			else if (!strcmp(value, "interactive"))
 				info->rebase = INTERACTIVE_REBASE;
+			else
+				warning(_("unhandled branch.%s.rebase=%s"),
+					name, value);
 		}
 	}
 	return 0;

gitgitgadget

From: Johannes Schindelin <[email protected]>

This backend has been deprecated in favor of git rebase --rebase-merges.

In preparation for dropping it, let's remove all the regression tests that would need it.

---
 azure-pipelines.yml                       |   2 -
 t/t3404-rebase-interactive.sh             |  76 -----------
 t/t3408-rebase-multi-line.sh              |  10 --
 t/t3409-rebase-preserve-merges.sh         | 127 ------------------
 t/t3410-rebase-preserve-dropped-merges.sh |  90 -------------
 t/t3411-rebase-preserve-around-merges.sh  |  80 ------------
 t/t3412-rebase-root.sh                    |  37 ------
 t/t3414-rebase-preserve-onto.sh           |  85 ------------
 t/t3418-rebase-continue.sh                |  15 ---
 t/t3421-rebase-topology-linear.sh         |  19 ---
 t/t3422-rebase-incompatible-options.sh    |  11 --
 t/t3425-rebase-topology-merges.sh         | 151 ----------------------
 t/t3427-rebase-subtree.sh                 |  19 ---
 t/t5520-pull.sh                           |  18 ---
 t/t7505-prepare-commit-msg-hook.sh        |   1 -
 t/t7517-per-repo-email.sh                 |  13 --
 t/test-lib.sh                             |   4 -
 17 files changed, 758 deletions(-)
 delete mode 100755 t/t3409-rebase-preserve-merges.sh
 delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh
 delete mode 100755 t/t3411-rebase-preserve-around-merges.sh
 delete mode 100755 t/t3414-rebase-preserve-onto.sh

index af2a5ea484..c75f27a7fa 100644
@@ -106,7 +106,6 @@ jobs:
       HOME: $(Build.SourcesDirectory)
       MSYSTEM: MINGW64
       NO_SVN_TESTS: 1
-      GIT_TEST_SKIP_REBASE_P: 1
   - powershell: |
       if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
         cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"

@@ -265,7 +264,6 @@ jobs:
       HOME: $(Build.SourcesDirectory)
       MSYSTEM: MINGW64
       NO_SVN_TESTS: 1
-      GIT_TEST_SKIP_REBASE_P: 1
   - powershell: |
       if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
         cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"

index d2bd7c17b0..126845a97c 100755
@@ -52,14 +52,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

index 21632a984e..7ba343198a 100755
@@ -86,17 +86,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 master &&
-	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 &&

@@ -120,13 +109,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 master &&
-	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 &&

@@ -155,13 +137,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 master &&
-	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 &&

@@ -261,21 +236,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 master &&
-	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

index 7a2da972fd..ce78b6b97b 100755
@@ -106,20 +106,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 &&

@@ -255,7 +241,6 @@ test_rerere_autoupdate
 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' '

index b847064f91..40375aff58 100755
@@ -29,7 +29,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 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 ''
 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 ''
 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 ''
 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 ''
 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 ''
 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 ''
 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 ''
 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 ''
 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 success ''
 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

@@ -230,7 +220,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

@@ -245,7 +234,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 success --rebase-merges
 
 #       m

@@ -285,7 +273,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 success -p
 
 test_run_rebase () {
 	result=$1

@@ -300,7 +287,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

@@ -315,7 +301,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 success -p
 
 test_run_rebase () {
 	result=$1

@@ -331,7 +316,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

@@ -346,7 +330,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

@@ -360,7 +343,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

@@ -375,6 +357,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

index 50e7960702..c1c9772ac2 100755
@@ -65,15 +65,4 @@ test_rebase_am_only --ignore-whitespace
 test_rebase_am_only --committer-date-is-author-date
 test_rebase_am_only -C4
 
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
-	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

index bec48e6a1f..ffe385e493 100755
@@ -66,25 +66,6 @@ test_expect_success 'setup' '
 	git commit -m "Empty commit" --allow-empty
 '
 
-# FAILURE: Does not preserve master4.
-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-master master &&
-	verbose test "$(commit_message HEAD~)" = "master4" &&
-	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
-'
-
-# FAILURE: Does not preserve master4.
-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-master master &&
-	verbose test "$(commit_message HEAD~2)" = "master4" &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
-	verbose test "$(commit_message HEAD)" = "Empty commit"
-'
-
 test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
 	reset_rebase &&
 	git checkout -b rebase-onto to-rebase &&

index 41b799e336..e5f679af33 100755
@@ -461,15 +461,6 @@ test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 	test file3 = "$(git show HEAD:file3.t)"
 '
 
-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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
-'
-
 test_expect_success 'pull.rebase=interactive' '
 	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
 	echo I was here >fake.out &&

@@ -515,15 +506,6 @@ test_expect_success '--rebase=true rebases and flattens keep-merge' '
 	test file3 = "$(git show HEAD:file3.t)"
 '
 
-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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
-'
-
 test_expect_success '--rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
 	! git pull --rebase=invalid . copy

index 94f85cdf83..1b4a7725fb 100755
@@ -247,7 +247,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 master" &&

index b2401cec3e..0dec7f756b 100755
@@ -72,19 +72,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 master
-'
-
-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 master
-'
-
 test_expect_success 'author.name overrides user.name' '
 	test_config user.name user &&
 	test_config user.email [email protected] &&

index 46c4440843..0ef620f975 100644
@@ -1634,7 +1634,3 @@ test_lazy_prereq CURL '
 test_lazy_prereq SHA1 '
 	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 '
-
-test_lazy_prereq REBASE_P '
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-'

gitgitgadget

From: Johannes Schindelin <[email protected]>

In preparation for git-rebase--preserve-merges.sh entering its after life, we remove this (deprecated) option that would still rely on it.

---
 Documentation/config/branch.txt        |  4 ----
 Documentation/config/pull.txt          |  4 ----
 Documentation/git-pull.txt             |  6 +-----
 builtin/pull.c                         | 12 +++---------
 contrib/completion/git-completion.bash |  2 +-
 5 files changed, 5 insertions(+), 23 deletions(-)

index a592d522a7..e9986ddd09 100644
@@ -85,10 +85,6 @@ When `merges`, 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` (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`, the rebase is run in interactive mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use

index b87cab31b3..9f2dea0b34 100644
@@ -18,10 +18,6 @@ When `merges`, 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` (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`, the rebase is run in interactive mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use

index dfb901f8b8..edda860a9a 100644
@@ -101,7 +101,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

@@ -112,10 +112,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 current branch into the upstream branch.
 +
 When `interactive`, enable the interactive mode of rebase.

index d25ff13a60..6c4d91d580 100644
@@ -30,7 +30,6 @@ enum rebase_type {
 	REBASE_INVALID = -1,
 	REBASE_FALSE = 0,
 	REBASE_TRUE,
-	REBASE_PRESERVE,
 	REBASE_MERGES,
 	REBASE_INTERACTIVE
 };

@@ -38,9 +37,8 @@ enum rebase_type {
 /**
  * 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)

@@ -51,8 +49,6 @@ static enum rebase_type parse_config_rebase(const char *key, 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"))

@@ -145,7 +141,7 @@ static struct option pull_options[] = {
 	/* Options passed to git-merge or git-rebase */
 	OPT_GROUP(N_("Options related to merging")),
 	{ OPTION_CALLBACK, '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,

@@ -848,8 +844,6 @@ static int run_rebase(const struct object_id *curr_head,
 	/* Options passed to git-rebase */
 	if (opt_rebase == REBASE_MERGES)
 		argv_array_push(&args, "--rebase-merges");
-	else if (opt_rebase == REBASE_PRESERVE)
-		argv_array_push(&args, "--preserve-merges");
 	else if (opt_rebase == REBASE_INTERACTIVE)
 		argv_array_push(&args, "--interactive");
 	if (opt_diffstat)

index 00fbe6c03d..5b37734ef1 100644
@@ -2276,7 +2276,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)

gitgitgadget

From: Johannes Schindelin <[email protected]>

This option was deprecated in favor of --rebase-merges some time ago, and now we retire it.

---
 .gitignore                     |    1 -
 Documentation/git-rebase.txt   |   47 --
 Makefile                       |    2 -
 builtin/rebase.c               |  135 +---
 git-rebase--preserve-merges.sh | 1067 --------------------------------
 5 files changed, 6 insertions(+), 1246 deletions(-)
 delete mode 100644 git-rebase--preserve-merges.sh

index 89b3b79c1a..9989dce1d2 100644
@@ -123,7 +123,6 @@
 /git-range-diff
 /git-read-tree
 /git-rebase
-/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote

index 58b92af54b..e2c26843e2 100644
@@ -616,7 +616,6 @@ SCRIPT_SH += git-web--browse.sh
 
 SCRIPT_LIB += git-mergetool--lib
 SCRIPT_LIB += git-parse-remote
-SCRIPT_LIB += git-rebase--preserve-merges
 SCRIPT_LIB += git-sh-setup
 SCRIPT_LIB += git-sh-i18n
 

@@ -2522,7 +2521,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
 LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
 LOCALIZED_SH = $(SCRIPT_SH)
 LOCALIZED_SH += git-parse-remote.sh
-LOCALIZED_SH += git-rebase--preserve-merges.sh
 LOCALIZED_SH += git-sh-setup.sh
 LOCALIZED_PERL = $(SCRIPT_PERL)
 

gitgitgadget

From: Johannes Schindelin <[email protected]>

We already passed the --rebase-merges option to git rebase instead, now we make this move permanent.

---
 Documentation/git-svn.txt | 1 -
 git-svn.perl              | 1 -
 2 files changed, 2 deletions(-)

index 6624a14fbd..6cfd48c9d3 100644
@@ -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

index 4aa208ff5f..f1fa1bc7f7 100755
@@ -271,7 +271,6 @@ sub _req_svn {
 			  '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',

gitgitgadget

Hi Eric,

Which urgency? The cover letter spells it out quite clearly that this is not even intended for v2.25.0, which is still over 2 months out.

The reason I submitted this patch series now is so that we can avoid inadvertent new users of the --preserve-merges backend.

The LTS distros will not even pick up this patch. So that's a red herring.

But yes, you're right, v2.25.0 will probably be the first version to even have the --rebase-merges option in git svn, and therefore v2.26.0 would be awfully early a time to drop --preserve-merges in git svn. Question is whether we want to split this patch series, or just rather wait with merging it to master until a year from now, or something like that?

Ciao,
Dscho

"Months" a blink of an eye when it comes to deprecations and removals.

Then documenting it as deprecated and warning is all that's needed.

Fwiw, I object to the regressions to all the other commands (rebase/pull/remote) in this series, too, but I mainly do Perl.

--preserve-merges was only deprecated in v2.22.0 (2019-06-07). LTS distro users are very likely on pre-v2.22.0, more likely v2.1x.0 and maybe even v2.x.0.

Their next LTS release could be several years from now. We could be on git 2.[345]x.0 by then and that's when the LTS packagers could package the next version. LTS users are likely to never see the entire period from v2.22.0..v2.25.0 and thus never see a deprecation warning.

Even Debian stable (not exactly LTS, but still on the slower side) went from v2.11.0 in Debian 9 all the way to v2.20.1 in Debian 10. Actual LTS users will see bigger jumps.

From: Johannes Schindelin <[email protected]>

It was only used by the --preserve-merges backend, which we just removed.

---
 builtin/rebase.c | 181 -----------------------------------------------
 git.c            |   1 -
 2 files changed, 182 deletions(-)

index 2970a9ae47..69ec2da624 100644
@@ -142,81 +142,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();

@@ -408,24 +333,6 @@ static int run_rebase_interactive(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);
 	}

@@ -433,94 +340,6 @@ static int run_rebase_interactive(struct rebase_options *opts,
 	return ret;
 }
 
-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_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
-		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
-			 N_("allow commits with empty messages")),
-		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);
-
-	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_rebase_interactive(&opts, command);
-}
-
 static int is_interactive(struct rebase_options *opts)
 {
 	return opts->type == REBASE_INTERACTIVE;

index ce6ab0ece2..015e155dcd 100644
@@ -551,7 +551,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 },

gitgitgadget

From: Johannes Schindelin <[email protected]>

---
 builtin/remote.c | 2 --
 1 file changed, 2 deletions(-)

index 3410ea19c7..afe9af09e9 100644
@@ -309,8 +309,6 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 			int v = git_parse_maybe_bool(value);
 			if (v >= 0)
 				info->rebase = v;
-			else if (!strcmp(value, "preserve"))
-				info->rebase = NORMAL_REBASE;
 			else if (!strcmp(value, "merges"))
 				info->rebase = REBASE_MERGES;
 			else if (!strcmp(value, "interactive"))

gitgitgadget

In 427c3bd28ab (rebase: deprecate --preserve-merges, 2019-03-11) (which was included in v2.22.0), we officially deprecated the --preserve-merges backend. Over two years later, it is time to drop that backend, and here is a patch series that does just that.

Changes since v1:

* Rebased onto v2.33.0

Johannes Schindelin (7):
t5520: do not use pull.rebase=preserve
remote: warn about unhandled branch.<name>.rebase values
tests: stop testing git rebase --preserve-merges
pull: remove support for --rebase=preserve
rebase: drop support for --preserve-merges
git-svn: drop support for --preserve-merges
rebase: drop the internal rebase--interactive command

 .github/workflows/main.yml                |    1 -
 .gitignore                                |    1 -
 Documentation/config/branch.txt           |    4 -
 Documentation/config/pull.txt             |    4 -
 Documentation/git-pull.txt                |    6 +-
 Documentation/git-rebase.txt              |   51 -
 Documentation/git-svn.txt                 |    1 -
 Makefile                                  |    2 -
 builtin/pull.c                            |    9 +-
 builtin/rebase.c                          |  318 +------
 builtin/remote.c                          |    3 +
 contrib/completion/git-completion.bash    |    2 +-
 git-rebase--preserve-merges.sh            | 1057 ---------------------
 git-svn.perl                              |    1 -
 git.c                                     |    1 -
 rebase.c                                  |    2 -
 rebase.h                                  |    1 -
 t/t3404-rebase-interactive.sh             |   76 --
 t/t3408-rebase-multi-line.sh              |   10 -
 t/t3409-rebase-preserve-merges.sh         |  130 ---
 t/t3410-rebase-preserve-dropped-merges.sh |   90 --
 t/t3411-rebase-preserve-around-merges.sh  |   80 --
 t/t3412-rebase-root.sh                    |   37 -
 t/t3414-rebase-preserve-onto.sh           |   85 --
 t/t3418-rebase-continue.sh                |   15 -
 t/t3421-rebase-topology-linear.sh         |   19 -
 t/t3422-rebase-incompatible-options.sh    |   11 -
 t/t3425-rebase-topology-merges.sh         |  151 ---
 t/t3427-rebase-subtree.sh                 |   19 -
 t/t5520-pull.sh                           |   24 +-
 t/t7505-prepare-commit-msg-hook.sh        |    1 -
 t/t7517-per-repo-email.sh                 |   13 -
 t/test-lib.sh                             |    4 -
 33 files changed, 17 insertions(+), 2212 deletions(-)
 delete mode 100644 git-rebase--preserve-merges.sh
 delete mode 100755 t/t3409-rebase-preserve-merges.sh
 delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh
 delete mode 100755 t/t3411-rebase-preserve-around-merges.sh
 delete mode 100755 t/t3414-rebase-preserve-onto.sh

base-commit: 225bc32a989d7a22fa6addafd4ce7dcd04675dbf
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-195%2Fdscho%2Fdrop-rebase-p-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-195/dscho/drop-rebase-p-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/195

Range-diff vs v1:

1: 662e16dbc12 ! 1: 8da29d539fc t5520: do not use pull.rebase=preserve
@@ t/t5520-pull.sh: test_expect_success '--rebase=false create a new merge commit'
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase=true . copy &&
- test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
- test file3 = "$(git show HEAD:file3.t)"
+ test_cmp_rev HEAD^^ copy &&
+ echo file3 >expect &&
@@ t/t5520-pull.sh: test_expect_success '--rebase=invalid fails' '
- ! git pull --rebase=invalid . copy
+ test_must_fail git pull --rebase=invalid . copy
'

-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
@@ t/t5520-pull.sh: test_expect_success '--rebase=invalid fails' '
- test_config pull.rebase preserve &&
+ test_config pull.rebase merges &&
git pull --rebase . copy &&
- test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
- test file3 = "$(git show HEAD:file3.t)"
+ test_cmp_rev HEAD^^ copy &&
+ echo file3 >expect &&

 2:  fb531064b35 < -:  ----------- remote: warn about unhandled branch.<name>.rebase values
 -:  ----------- > 2:  acda0f59947 remote: warn about unhandled branch.<name>.rebase values
 3:  b614336f3df ! 3:  cdb9fae4b93 tests: stop testing `git rebase --preserve-merges`
     @@ Commit message
      
          Signed-off-by: Johannes Schindelin <[email protected]>
      
     - ## azure-pipelines.yml ##
     -@@ azure-pipelines.yml: jobs:
     -       HOME: $(Build.SourcesDirectory)
     -       MSYSTEM: MINGW64
     -       NO_SVN_TESTS: 1
     --      GIT_TEST_SKIP_REBASE_P: 1
     -   - powershell: |
     -       if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
     -         cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
     -@@ azure-pipelines.yml: jobs:
     -       HOME: $(Build.SourcesDirectory)
     -       MSYSTEM: MINGW64
     -       NO_SVN_TESTS: 1
     --      GIT_TEST_SKIP_REBASE_P: 1
     -   - powershell: |
     -       if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
     -         cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
     + ## .github/workflows/main.yml ##
     +@@ .github/workflows/main.yml: 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()
      
       ## t/t3404-rebase-interactive.sh ##
      @@ t/t3404-rebase-interactive.sh: test_expect_success 'retain authorship when squashing' '
     @@ t/t3404-rebase-interactive.sh: test_expect_success 'retain authorship when squas
      -'
      -
      -test_expect_success REBASE_P 'preserve merges with -p' '
     --	git checkout -b to-be-preserved master^ &&
     +-	git checkout -b to-be-preserved primary^ &&
      -	: > unrelated-file &&
      -	git add unrelated-file &&
      -	test_tick &&
      -	git commit -m "unrelated" &&
     --	git checkout -b another-branch master &&
     +-	git checkout -b another-branch primary &&
      -	echo B > file1 &&
      -	test_tick &&
      -	git commit -m J file1 &&
     @@ t/t3404-rebase-interactive.sh: test_expect_success 'retain authorship when squas
      -	git commit -m M file1 &&
      -	git checkout -b to-be-rebased &&
      -	test_tick &&
     --	git rebase -i -p --onto branch1 master &&
     +-	git rebase -i -p --onto branch1 primary &&
      -	git update-index --refresh &&
      -	git diff-files --quiet &&
      -	git diff-index --quiet --cached HEAD -- &&
     --	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
     --	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
     --	test $(git rev-parse HEAD^^2^) = $(git rev-parse 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 &&
     @@ t/t3409-rebase-preserve-merges.sh (deleted)
      -
      -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
     @@ t/t3409-rebase-preserve-merges.sh (deleted)
      -
      -# Clone 2 (conflicting merge):
      -#
     --# A1--A2--B3   <-- origin/master
     +-# A1--A2--B3   <-- origin/main
      -#  \       \
      -#   B1------M  <-- topic
      -#    \
     @@ t/t3409-rebase-preserve-merges.sh (deleted)
      -#
      -# Clone 3 (no-ff merge):
      -#
     --# A1--A2--B3   <-- origin/master
     +-# A1--A2--B3   <-- origin/main
      -#  \
      -#   B1------M  <-- topic
      -#    \     /
     @@ t/t3409-rebase-preserve-merges.sh (deleted)
      -	echo Second > B &&
      -	git add B &&
      -	git commit -m "Add B1" &&
     --	git checkout -f master &&
     +-	git checkout -f main &&
      -	echo Third >> A &&
      -	git commit -a -m "Modify A2" &&
      -	echo Fifth > B &&
     @@ t/t3409-rebase-preserve-merges.sh (deleted)
      -	(
      -		cd clone2 &&
      -		git checkout -b topic origin/topic &&
     --		test_must_fail git merge origin/master &&
     +-		test_must_fail git merge origin/main &&
      -		echo Resolved >B &&
      -		git add B &&
     --		git commit -m "Merge origin/master into topic"
     +-		git commit -m "Merge origin/main into topic"
      -	) &&
      -
      -	git clone ./. clone3 &&
     @@ t/t3412-rebase-root.sh: test_expect_success 'pre-rebase got correct input (4)' '
       
      -test_expect_success REBASE_P 'rebase -i -p with linear history' '
      -	git checkout -b work5 other &&
     --	git rebase -i -p --root --onto master &&
     +-	git rebase -i -p --root --onto main &&
      -	git log --pretty=tformat:"%s" > rebased5 &&
      -	test_cmp expect rebased5
      -'
     @@ t/t3412-rebase-root.sh: commit work6~4
       
      -test_expect_success REBASE_P 'rebase -i -p with merge' '
      -	git checkout -b work6 other &&
     --	git rebase -i -p --root --onto master &&
     +-	git rebase -i -p --root --onto main &&
      -	log_with_names work6 > rebased6 &&
      -	test_cmp expect-side rebased6
      -'
     @@ t/t3412-rebase-root.sh: commit work7~5
       
      -test_expect_success REBASE_P 'rebase -i -p with two roots' '
      -	git checkout -b work7 other &&
     --	git rebase -i -p --root --onto master &&
     +-	git rebase -i -p --root --onto main &&
      -	log_with_names work7 > rebased7 &&
      -	test_cmp expect-third rebased7
      -'
     @@ t/t3412-rebase-root.sh: commit conflict3~6
       
      -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 master &&
     +-	test_must_fail git rebase -i -p --root --onto main &&
      -	git ls-files -u | grep "B$"
      -'
      -
     @@ t/t3418-rebase-continue.sh: test_rerere_autoupdate
      
       ## t/t3421-rebase-topology-linear.sh ##
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_expect_success 'setup branches and remote tracking' '
       	git tag -l >tags &&
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     -@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
     +@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success --apply
       test_run_rebase success --fork-point
       test_run_rebase success -m
       test_run_rebase success -i
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
       
       test_run_rebase () {
       	result=$1
     -@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
     +@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success --apply
       test_run_rebase success --fork-point
       test_run_rebase success -m
       test_run_rebase success -i
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
       
       test_run_rebase () {
       	result=$1
     -@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
     +@@ t/t3421-rebase-topology-linear.sh: test_run_rebase success --apply
       test_run_rebase success --fork-point
       test_run_rebase success -m
       test_run_rebase success -i
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase success ''
       #       f
       #      /
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       # a---b---c---j!
       #      \
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + test_run_rebase failure --apply
       test_run_rebase success -m
       test_run_rebase success -i
     --test_have_prereq !REBASE_P || test_run_rebase success -p
     +-test_have_prereq !REBASE_P || test_run_rebase failure -p
       
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: 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_have_prereq !REBASE_P || test_run_rebase success -p
       
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: 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_have_prereq !REBASE_P || test_run_rebase success -p
       test_run_rebase success --rebase-merges
       
       #       m
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_run_rebase () {
       	result=$1
      @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
     - test_run_rebase success ''
     + 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
     @@ t/t3421-rebase-topology-linear.sh: test_run_rebase () {
       test_done
      
       ## t/t3422-rebase-incompatible-options.sh ##
     -@@ t/t3422-rebase-incompatible-options.sh: test_rebase_am_only --ignore-whitespace
     - test_rebase_am_only --committer-date-is-author-date
     +@@ t/t3422-rebase-incompatible-options.sh: 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' '
     @@ t/t3422-rebase-incompatible-options.sh: test_rebase_am_only --ignore-whitespace
       test_done
      
       ## t/t3425-rebase-topology-merges.sh ##
     -@@ t/t3425-rebase-topology-merges.sh: test_run_rebase success 'd n o e' ''
     +@@ t/t3425-rebase-topology-merges.sh: 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
       
     @@ t/t3427-rebase-subtree.sh: test_expect_success 'setup' '
       	git commit -m "Empty commit" --allow-empty
       '
       
     --# FAILURE: Does not preserve master4.
     +-# 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-master master &&
     --	verbose test "$(commit_message HEAD~)" = "master4" &&
     --	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
     +-	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 master4.
     +-# 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-master master &&
     --	verbose test "$(commit_message HEAD~2)" = "master4" &&
     --	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
     +-	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 --keep-empty --onto commit' '
     + test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
       	reset_rebase &&
       	git checkout -b rebase-onto to-rebase &&
      
       ## t/t5520-pull.sh ##
      @@ t/t5520-pull.sh: test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
     - 	test file3 = "$(git show HEAD:file3.t)"
     + 	test_cmp expect actual
       '
       
      -test_expect_success REBASE_P \
     @@ t/t5520-pull.sh: test_expect_success 'pull.rebase=1 is treated as true and flatt
      -	git reset --hard before-preserve-rebase &&
      -	test_config pull.rebase preserve &&
      -	git pull . copy &&
     --	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
     --	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
     +-	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 &&
      @@ t/t5520-pull.sh: test_expect_success '--rebase=true rebases and flattens keep-merge' '
     - 	test file3 = "$(git show HEAD:file3.t)"
     + 	test_cmp expect actual
       '
       
      -test_expect_success REBASE_P \
     @@ t/t5520-pull.sh: test_expect_success '--rebase=true rebases and flattens keep-me
      -	git reset --hard before-preserve-rebase &&
      -	test_config pull.rebase true &&
      -	git pull --rebase=preserve . copy &&
     --	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
     --	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
     +-	test_cmp_rev HEAD^^ copy &&
     +-	test_cmp_rev HEAD^2 keep-merge
      -'
      -
       test_expect_success '--rebase=invalid fails' '
       	git reset --hard before-preserve-rebase &&
     - 	! git pull --rebase=invalid . copy
     + 	test_must_fail git pull --rebase=invalid . copy
      
       ## t/t7505-prepare-commit-msg-hook.sh ##
      @@ t/t7505-prepare-commit-msg-hook.sh: test_rebase () {
     @@ t/t7505-prepare-commit-msg-hook.sh: test_rebase () {
      -test_have_prereq !REBASE_P || test_rebase success -p
       
       test_expect_success 'with hook (cherry-pick)' '
     - 	test_when_finished "git checkout -f master" &&
     + 	test_when_finished "git checkout -f main" &&
      
       ## t/t7517-per-repo-email.sh ##
      @@ t/t7517-per-repo-email.sh: test_expect_success 'noop interactive rebase does not care about ident' '
     @@ t/t7517-per-repo-email.sh: test_expect_success 'noop interactive rebase does not
      -test_expect_success REBASE_P \
      -	'fast-forward rebase does not care about ident (preserve)' '
      -	git checkout -B tmp side-without-commit &&
     --	git rebase -p master
     +-	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 master
     +-	test_must_fail git rebase -p main
      -'
      -
       test_expect_success 'author.name overrides user.name' '
     @@ t/t7517-per-repo-email.sh: test_expect_success 'noop interactive rebase does not
       	test_config user.email [email protected] &&
      
       ## t/test-lib.sh ##
     -@@ t/test-lib.sh: test_lazy_prereq CURL '
     - test_lazy_prereq SHA1 '
     - 	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
     +@@ t/test-lib.sh: 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.

4: 0c8bfe5d18d ! 4: b493046134d pull: remove support for --rebase=preserve
@@ Commit message

## Documentation/config/branch.txt ##
-@@ Documentation/config/branch.txt: When merges, pass the --rebase-merges option to 'git rebase' +@@ Documentation/config/branch.txt: 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 (deprecated in favor of merges), also pass
+-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, the rebase is run in interactive mode.
+ When the value is interactive (or just 'i'), the rebase is run in interactive
+ mode.
+
- *NOTE*: this is a possibly dangerous operation; do *not* use

## Documentation/config/pull.txt ##
-@@ Documentation/config/pull.txt: When merges, pass the --rebase-merges option to 'git rebase' +@@ Documentation/config/pull.txt: 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 (deprecated in favor of merges), also pass
+-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, the rebase is run in interactive mode.
+ When the value is interactive (or just 'i'), the rebase is run in interactive
+ mode.
+
- *NOTE*: this is a possibly dangerous operation; do *not* use

## Documentation/git-pull.txt ##
@@ Documentation/git-pull.txt: Options related to merging
@@ Documentation/git-pull.txt: When set to merges, rebase using `git rebase --reb
---preserve-merges option passed to git rebase so that locally created -merge commits will not be flattened.
-+
- When false, merge the current branch into the upstream branch.
+ When false, merge the upstream branch into the current branch.
+
When interactive, enable the interactive mode of rebase.

## builtin/pull.c ##
-@@ builtin/pull.c: enum rebase_type {
- REBASE_INVALID = -1,
- REBASE_FALSE = 0,
- REBASE_TRUE,
-- REBASE_PRESERVE,
- REBASE_MERGES,
- REBASE_INTERACTIVE
- };
-@@ builtin/pull.c: enum rebase_type {
+@@
/**
* 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
@@ builtin/pull.c: enum rebase_type {
*/
static enum rebase_type parse_config_rebase(const char *key, const char *value,
int fatal)
-@@ builtin/pull.c: static enum rebase_type parse_config_rebase(const char *key, 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"))
@@ builtin/pull.c: static struct option pull_options[] = {
/* Options passed to git-merge or git-rebase */
OPT_GROUP(N_("Options related to merging")),
- { OPTION_CALLBACK, '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_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,
-@@ builtin/pull.c: static int run_rebase(const struct object_id *curr_head,
+@@ builtin/pull.c: static int run_rebase(const struct object_id *newbase,
/* Options passed to git-rebase */
if (opt_rebase == REBASE_MERGES)
- argv_array_push(&args, "--rebase-merges");
+ strvec_push(&args, "--rebase-merges");
- else if (opt_rebase == REBASE_PRESERVE)
-- argv_array_push(&args, "--preserve-merges");
+- strvec_push(&args, "--preserve-merges");
else if (opt_rebase == REBASE_INTERACTIVE)
- argv_array_push(&args, "--interactive");
+ strvec_push(&args, "--interactive");
if (opt_diffstat)

## contrib/completion/git-completion.bash ##
@@ contrib/completion/git-completion.bash: __git_complete_config_variable_value ()
return
;;
remote.pushdefault)
+
+ ## rebase.c ##
+@@ rebase.c: 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"))
+
+ ## rebase.h ##
+@@ rebase.h: enum rebase_type {
+ REBASE_INVALID = -1,
+ REBASE_FALSE = 0,
+ REBASE_TRUE,
+- REBASE_PRESERVE,
+ REBASE_MERGES,
+ REBASE_INTERACTIVE
+ };
5: 14e242b3cf9 ! 5: eb738b1bf05 rebase: drop support for --preserve-merges
@@ Documentation/git-rebase.txt: i.e. commits that would be excluded by linkgit:git
onto <upstream> (or <onto>, if specified).
+
-The --rebase-merges mode is similar in spirit to the deprecated
----preserve-merges, but in contrast to that option works well in interactive --rebases: commits can be reordered, inserted and dropped at will. +---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 recursive merge strategy; Different merge strategies can be used only via
@@ Documentation/git-rebase.txt: are incompatible with the following options:
- * --preserve-merges
* --interactive
* --exec
- * --keep-empty
+ * --no-keep-empty
@@ Documentation/git-rebase.txt: are incompatible with the following options:

In addition, the following pairs of options are incompatible:
@@ Documentation/git-rebase.txt: are incompatible with the following options:
- * --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
-
-@@ Documentation/git-rebase.txt: merge tlsv1.3
- merge cmake
- ------------
+ * --fork-point and --root
+@@ Documentation/git-rebase.txt: CONFIGURATION
+ include::config/rebase.txt[]
+ include::config/sequencer.txt[]

-BUGS
-----
@@ Documentation/git-rebase.txt: merge tlsv1.3
Part of the linkgit:git[1] suite

## Makefile ##
-@@ Makefile: SCRIPT_SH += git-web--browse.sh +@@ Makefile: SCRIPT_SH += git-submodule.sh
+ SCRIPT_SH += git-web--browse.sh

SCRIPT_LIB += git-mergetool--lib
- SCRIPT_LIB += git-parse-remote
-SCRIPT_LIB += git-rebase--preserve-merges
- SCRIPT_LIB += git-sh-setup
SCRIPT_LIB += git-sh-i18n
+ SCRIPT_LIB += git-sh-setup

@@ Makefile: 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-parse-remote.sh
-LOCALIZED_SH += git-rebase--preserve-merges.sh
LOCALIZED_SH += git-sh-setup.sh
LOCALIZED_PERL = $(SCRIPT_PERL)

## builtin/rebase.c ##
-@@ builtin/rebase.c: enum rebase_type {
+@@ builtin/rebase.c: static GIT_PATH_FUNC(merge_dir, "rebase-merge")
+ enum rebase_type {
REBASE_UNSPECIFIED = -1,
- REBASE_AM,
- REBASE_MERGE,
-- REBASE_INTERACTIVE,
+ REBASE_APPLY,
+- REBASE_MERGE,
- REBASE_PRESERVE_MERGES
-+ REBASE_INTERACTIVE
++ REBASE_MERGE
};

- struct rebase_options {
+ enum empty_type {
@@ builtin/rebase.c: int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)

- static int is_interactive(struct rebase_options *opts)
+ static int is_merge(struct rebase_options *opts) {
-- return opts->type == REBASE_INTERACTIVE ||
+- return opts->type == REBASE_MERGE ||
- opts->type == REBASE_PRESERVE_MERGES;
-+ return opts->type == REBASE_INTERACTIVE;
++ return opts->type == REBASE_MERGE;
}

- static void imply_interactive(struct rebase_options *opts, const char *option) -@@ builtin/rebase.c: static void imply_interactive(struct rebase_options *opts, const char *option)
- die(_("%s requires an interactive rebase"), option);
+ static void imply_merge(struct rebase_options *opts, const char *option)
+@@ builtin/rebase.c: static void imply_merge(struct rebase_options *opts, const char *option)
+ die(_("%s requires the merge backend"), option);
break;
- case REBASE_INTERACTIVE:
+ case REBASE_MERGE:
- case REBASE_PRESERVE_MERGES:
break;
- case REBASE_MERGE:
- /* we now implement --merge via --interactive */
+ default:
+ opts->type = REBASE_MERGE; /* implied */
@@ builtin/rebase.c: static struct commit *peel_committish(const char *name)
return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
}
@@ builtin/rebase.c: static struct commit *peel_committish(const char *name)
- }
-}
-
- #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
-
- #define RESET_HEAD_DETACH (1<<0)
+ static int move_to_original_branch(struct rebase_options *opts)
+ {
+ struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
@@ builtin/rebase.c: static int run_am(struct rebase_options *opts)

static int run_specific_rebase(struct rebase_options *opts, enum action action)
@@ builtin/rebase.c: static int run_am(struct rebase_options *opts)
int status;
- const char *backend, *backend_func;

- if (opts->type == REBASE_INTERACTIVE) {
- /* Run builtin interactive rebase */
+ if (opts->type == REBASE_MERGE) {
+ /* Run sequencer-based rebase */
@@ builtin/rebase.c: static int run_specific_rebase(struct rebase_options *opts, enum action action)
}

- status = run_rebase_interactive(opts, action);
+ status = run_sequencer_rebase(opts, action);
- goto finished_rebase;
- }
-
-- if (opts->type == REBASE_AM) {
-+ } else if (opts->type == REBASE_AM)
+- if (opts->type == REBASE_APPLY) {
++ } else if (opts->type == REBASE_APPLY)
status = run_am(opts);
- goto finished_rebase;
- }
@@ builtin/rebase.c: static int run_specific_rebase(struct rebase_options *opts, en
- 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);
-- add_var(&script_snippet, "GIT_QUIET",
-- opts->flags & REBASE_NO_QUIET ? "" : "t");
-- sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
+- 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",
@@ builtin/rebase.c: static int run_specific_rebase(struct rebase_options *opts, en
- add_var(&script_snippet, "git_format_patch_opt",
- opts->git_format_patch_opt.buf);
-
-- if (is_interactive(opts) &&
+- if (is_merge(opts) &&
- !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
- strbuf_addstr(&script_snippet,
- "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
@@ builtin/rebase.c: static int run_specific_rebase(struct rebase_options *opts, en
-finished_rebase:
if (opts->dont_finish_rebase)
; /* do nothing */
- else if (opts->type == REBASE_INTERACTIVE)
+ else if (opts->type == REBASE_MERGE)
@@ builtin/rebase.c: 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 },
+ parse_opt_interactive),
- OPT_SET_INT_F('p', "preserve-merges", &options.type,
- N_("(DEPRECATED) try to recreate merges instead of "
- "ignoring them"),
- REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
- OPT_BOOL('k', "keep-empty", &options.keep_empty,
- N_("preserve empty commits during rebase")),
+ OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
+ N_("how to handle commits that become empty"),
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/rewritten", merge_dir());
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
if (options.onto_name)
die(_("cannot combine '--keep-base' with '--onto'"));
@@ builtin/rebase.c: 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_INTERACTIVE:
- case REBASE_PRESERVE_MERGES:
/* compatible */
break;
case REBASE_UNSPECIFIED:
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+
switch (options.type) {
case REBASE_MERGE:
- case REBASE_INTERACTIVE:
- case REBASE_PRESERVE_MERGES:
options.state_dir = merge_dir();
break;
- case REBASE_AM:
+ case REBASE_APPLY:
@@ builtin/rebase.c: 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'");
- argv_array_push(&options.git_am_opts, "--signoff");
+ strvec_push(&options.git_am_opts, "--signoff");
options.flags |= REBASE_FORCE;
}

@@ git-rebase--preserve-merges.sh (deleted)
- fi
-}
-
--# Put the last action marked done at the beginning of the todo list --# again. If there has not been an action marked done yet, leave the list of --# items on the todo list unchanged.
--reschedule_last_action () {
-- tail -n 1 "$done" | cat - "$todo" >"$todo".new
-- sed -e \$d <"$done" >"$done".new
-- mv -f "$todo".new "$todo"
-- mv -f "$done".new "$done"
--}
--
-append_todo_help () {
- gettext "
-Commands:

 6:  b7ba83969da = 6:  a987e9439af git-svn: drop support for `--preserve-merges`
 7:  634e4141e97 ! 7:  4492cca369c rebase: drop the internal `rebase--interactive` command
     @@ builtin/rebase.c: static const char *action_names[] = { "undefined",
       static int edit_todo_file(unsigned flags)
       {
       	const char *todo_file = rebase_path_todo();
     -@@ builtin/rebase.c: static int run_rebase_interactive(struct rebase_options *opts,
     +@@ builtin/rebase.c: static int run_sequencer_rebase(struct rebase_options *opts,
       
       		break;
       	}
     @@ builtin/rebase.c: static int run_rebase_interactive(struct rebase_options *opts,
       	default:
       		BUG("invalid command '%d'", command);
       	}
     -@@ builtin/rebase.c: static int run_rebase_interactive(struct rebase_options *opts,
     - 	return ret;
     +@@ builtin/rebase.c: static int parse_opt_keep_empty(const struct option *opt, const char *arg,
     + 	return 0;
       }
       
      -static const char * const builtin_rebase_interactive_usage[] = {
     @@ builtin/rebase.c: static int run_rebase_interactive(struct rebase_options *opts,
      -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;
     +-	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_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
     --		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
     --			 N_("allow commits with empty messages")),
     +-		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")),
     @@ builtin/rebase.c: static int run_rebase_interactive(struct rebase_options *opts,
      -		warning(_("--[no-]rebase-cousins has no effect without "
      -			  "--rebase-merges"));
      -
     --	return !!run_rebase_interactive(&opts, command);
     +-	return !!run_sequencer_rebase(&opts, command);
      -}
      -
     - static int is_interactive(struct rebase_options *opts)
     + static int is_merge(struct rebase_options *opts)
       {
     - 	return opts->type == REBASE_INTERACTIVE;
     + 	return opts->type == REBASE_MERGE;
      
       ## git.c ##
      @@ git.c: static struct cmd_struct commands[] = {

8: 45fee72059d < -: ----------- remote: no longer claim that branch.*.rebase=preserve is a thing

gitgitgadget

From: Johannes Schindelin <[email protected]>

Even if those tests try to override that setting, let's not use it because it is deprecated: let's use merges instead.

---
 t/t5520-pull.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

index e2c0c510222..bb9b6b900eb 100755
@@ -598,7 +598,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 &&

@@ -620,9 +620,9 @@ test_expect_success '--rebase=invalid fails' '
 	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 &&

gitgitgadget

From: Johannes Schindelin <[email protected]>

We ignore them silently, but it actually makes sense to warn the users that their config setting has no effect.

---
 builtin/remote.c | 3 +++
 1 file changed, 3 insertions(+)

index 7f88e6ce9de..5705e088e5b 100644
@@ -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)

gitgitgadget

From: Johannes Schindelin <[email protected]>

This backend has been deprecated in favor of git rebase --rebase-merges.

In preparation for dropping it, let's remove all the regression tests that would need it.

---
 .github/workflows/main.yml                |   1 -
 t/t3404-rebase-interactive.sh             |  76 -----------
 t/t3408-rebase-multi-line.sh              |  10 --
 t/t3409-rebase-preserve-merges.sh         | 130 -------------------
 t/t3410-rebase-preserve-dropped-merges.sh |  90 -------------
 t/t3411-rebase-preserve-around-merges.sh  |  80 ------------
 t/t3412-rebase-root.sh                    |  37 ------
 t/t3414-rebase-preserve-onto.sh           |  85 ------------
 t/t3418-rebase-continue.sh                |  15 ---
 t/t3421-rebase-topology-linear.sh         |  19 ---
 t/t3422-rebase-incompatible-options.sh    |  11 --
 t/t3425-rebase-topology-merges.sh         | 151 ----------------------
 t/t3427-rebase-subtree.sh                 |  19 ---
 t/t5520-pull.sh                           |  18 ---
 t/t7505-prepare-commit-msg-hook.sh        |   1 -
 t/t7517-per-repo-email.sh                 |  13 --
 t/test-lib.sh                             |   4 -
 17 files changed, 760 deletions(-)
 delete mode 100755 t/t3409-rebase-preserve-merges.sh
 delete mode 100755 t/t3410-rebase-preserve-dropped-merges.sh
 delete mode 100755 t/t3411-rebase-preserve-around-merges.sh
 delete mode 100755 t/t3414-rebase-preserve-onto.sh

index 47876a4f02e..6115755c4df 100644
@@ -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()

index ab0960e6d99..cde3562e3a6 100755
@@ -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

index fda62c65bd5..19c6f4acbf6 100755
@@ -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

index f4c2ee02bc9..b62c16026fc 100755
@@ -109,20 +109,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 &&

@@ -258,7 +244,6 @@ test_rerere_autoupdate
 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' '

index 4a9204b4b64..62d86d557da 100755
@@ -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

index c8234062c6c..eb0a3d9d487 100755
@@ -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

index e78c7e37969..3bb023d7669 100755
@@ -69,25 +69,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 &&

index bb9b6b900eb..a2924036ad4 100755
@@ -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 &&

@@ -606,15 +597,6 @@ 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

index 7a8194ce720..2a07c708679 100755
@@ -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" &&

index 405420ae4d8..163ae804685 100755
@@ -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 [email protected] &&

index abcfbed6d61..11a9c8a6516 100644
@@ -1708,10 +1708,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.

gitgitgadget

From: Johannes Schindelin <[email protected]>

In preparation for git-rebase--preserve-merges.sh entering its after life, we remove this (deprecated) option that would still rely on it.

---
 Documentation/config/branch.txt        | 4 ----
 Documentation/config/pull.txt          | 4 ----
 Documentation/git-pull.txt             | 6 +-----
 builtin/pull.c                         | 9 +++------
 contrib/completion/git-completion.bash | 2 +-
 rebase.c                               | 2 --
 rebase.h                               | 1 -
 7 files changed, 5 insertions(+), 23 deletions(-)

index cc5f3249fc5..d323d7327f6 100644
@@ -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.
 +

index 54048306095..9349e09261b 100644
@@ -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.
 +

index 7f4b2d1982e..7144690a0cb 100644
@@ -102,7 +102,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

@@ -113,10 +113,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.

index 3e13f810843..bda5c32ab6f 100644
@@ -30,9 +30,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)

@@ -126,7 +125,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,

@@ -883,8 +882,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)

index 4bdd27ddc87..5dab8bd579e 100644
@@ -2543,7 +2543,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)

index f8137d859b5..877c068687c 100644
@@ -20,8 +20,6 @@ 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"))

index cc723d47489..203b4372823 100644
@@ -5,7 +5,6 @@ enum rebase_type {
 	REBASE_INVALID = -1,
 	REBASE_FALSE = 0,
 	REBASE_TRUE,
-	REBASE_PRESERVE,
 	REBASE_MERGES,
 	REBASE_INTERACTIVE
 };

gitgitgadget

From: Johannes Schindelin <[email protected]>

This option was deprecated in favor of --rebase-merges some time ago, and now we retire it.

---
 .gitignore                     |    1 -
 Documentation/git-rebase.txt   |   51 --
 Makefile                       |    2 -
 builtin/rebase.c               |  133 +---
 git-rebase--preserve-merges.sh | 1057 --------------------------------
 5 files changed, 6 insertions(+), 1238 deletions(-)
 delete mode 100644 git-rebase--preserve-merges.sh

index 311841f9bed..98d6275b20d 100644
@@ -125,7 +125,6 @@
 /git-range-diff
 /git-read-tree
 /git-rebase
-/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote

index 9573190f1d7..43f93f61660 100644
@@ -616,7 +616,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
 

@@ -2649,7 +2648,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)
 

gitgitgadget

Hi Ævar,

Valid point, I missed it because compiling with DEVELOPER=1 did not complain (because strbuf_release() "uses" the variable).

Ciao,
Dscho

As an aside I was looking the other day to see if some variant of -Wunused was smart enough to exclude (preferably a configurable) list of functions. E.g.:

    void *some_var = malloc(123);
    free(some_var);

Could be unused if something was smart to see that a thing only interacting with "malloc" and "free" wasn't otherwise used, and likewise we could add "strbuf_release" and other such free() functions to such a list.

But I didn't find anything...

Hi Ævar,

Thank you for offering your perspective.

From a readability point of view, I disagree with your assessment. Just because it can be written shorter does not mean that it is clearer. Quite the contrary, if you ask me. And since _I_ am contributing this patch series, I will respectfully disagree and keep the version I find more intuitive.

You could potentially talk me into adding a patch that renames that function to is_merge_backend(), but that's as far as I would go. And I am not really certain that that would improve things, either.

Ciao,
Dscho

I should have phrased that "Let's squash this in" less forcefully, to be clear it was just a suggestion. I'm fine with you not taking that squash. This series is good either way.

But just to poke a bit at the rationale: I'd be totally on-board with keeping it because we'd like the smallest possible diff here, even if that ends up including this oddity.

But in terms of making the end-result more readable I don't really see that.

We're left with a mismatch of some things comparing the enum label directly, and some using this function, and then there's REBASE_APPLY. To make it consistent we could alternatively have the diff here at the end, but having some mixture of both seems like the worst end-result, shouldn't we pick one way of inspecting these flags and use that consistently?

(I did not convert the few REBASE_UNSPECIFIED, but those comparisons could similarly be is_unspecified(), and all three could be named is_*_backend() per your suggestion).

index d707e3604e7..ef82a5f1668 100644
@@ -388,6 +388,11 @@ static int is_merge(struct rebase_options *opts)
 	return opts->type == REBASE_MERGE;
 }
 
+static int is_apply(struct rebase_options *opts)
+{
+	return opts->type == REBASE_APPLY;
+}
+
 static void imply_merge(struct rebase_options *opts, const char *option)
 {
 	switch (opts->type) {

@@ -558,7 +563,7 @@ static int finish_rebase(struct rebase_options *opts)
 	 * user should see them.
 	 */
 	run_auto_maintenance(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
-	if (opts->type == REBASE_MERGE) {
+	if (is_merge(opts)) {
 		struct replay_opts replay = REPLAY_OPTS_INIT;
 
 		replay.action = REPLAY_INTERACTIVE_REBASE;

@@ -744,7 +749,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	struct strbuf script_snippet = STRBUF_INIT;
 	int status;
 
-	if (opts->type == REBASE_MERGE) {
+	if (is_merge(opts)) {
 		/* Run sequencer-based rebase */
 		setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
 		if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {

@@ -759,14 +764,14 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 		}
 
 		status = run_sequencer_rebase(opts, action);
-	} else if (opts->type == REBASE_APPLY)
+	} else if (is_apply(opts))
 		status = run_am(opts);
 	else
 		BUG("Unhandled rebase type %d", opts->type);
 
 	if (opts->dont_finish_rebase)
 		; /* do nothing */
-	else if (opts->type == REBASE_MERGE)
+	else if (is_merge(opts))
 		; /* merge backend cleans up after itself */
 	else if (status == 0) {
 		if (!file_exists(state_dir_path("stopped-sha", opts)))

@@ -1293,7 +1298,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	}
 	case ACTION_QUIT: {
 		save_autostash(state_dir_path("autostash", &options));
-		if (options.type == REBASE_MERGE) {
+		if (is_merge(&options)) {
 			struct replay_opts replay = REPLAY_OPTS_INIT;
 
 			replay.action = REPLAY_INTERACTIVE_REBASE;

@@ -1406,7 +1411,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		imply_merge(&options, "--rebase-merges");
 	}
 
-	if (options.type == REBASE_APPLY) {
+	if (is_apply(&options)) {
 		if (ignore_whitespace)
 			strvec_push(&options.git_am_opts,
 				    "--ignore-whitespace");

@@ -1452,7 +1457,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	if (options.type == REBASE_MERGE)
+	if (is_merge(&options))
 		imply_merge(&options, "--merge");
 
 	if (options.root && !options.onto_name)

@@ -1461,7 +1466,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (isatty(2) && options.flags & REBASE_NO_QUIET)
 		strbuf_addstr(&options.git_format_patch_opt, " --progress");
 
-	if (options.git_am_opts.nr || options.type == REBASE_APPLY) {
+	if (options.git_am_opts.nr || is_apply(&options)) {
 		/* all am options except -q are compatible only with --apply */
 		for (i = options.git_am_opts.nr - 1; i >= 0; i--)
 			if (strcmp(options.git_am_opts.v[i], "-q"))

@@ -1486,7 +1491,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			    options.default_backend);
 	}
 
-	if (options.type == REBASE_MERGE &&
+	if (is_merge(&options) &&
 	    !options.strategy &&
 	    getenv("GIT_TEST_MERGE_ALGORITHM"))
 		options.strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));

You could, but certainly don't have to, squash in the below. I.e. this is the last user of eval_ngettext!

I mentioned in <[email protected]> that I'd recently come up with pretty much the same diff, that was because I was seeing how much of the shellscript gettext support I could rip out.

This is a major step to getting a whole section of git's shellscript support infrastructure out-of-tree, i.e. git-sh-i18n.sh, and the sh-i18n--envsubst built-in helper.

If I then merge mirucam/git-bisect-work-part4-v6 & gitster/ar/submodule-run-update-procedure along with this we'll have a relatively small amount of gettext-in-sh code left, which should be entirely gone before too long. Yay!

index e3d9f4836db..a15c0620db6 100644
@@ -51,12 +51,6 @@ gettext_without_eval_gettext)
 		)
 	}
 
-	eval_ngettext () {
-		ngettext "$1" "$2" "$3" | (
-			export PATH $(git sh-i18n--envsubst --variables "$2");
-			git sh-i18n--envsubst "$2"
-		)
-	}
 	;;
 *)
 	gettext () {

@@ -70,12 +64,6 @@ gettext_without_eval_gettext)
 		)
 	}
 
-	eval_ngettext () {
-		(test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
-			export PATH $(git sh-i18n--envsubst --variables "$2");
-			git sh-i18n--envsubst "$2"
-		)
-	}
 	;;
 esac
 

Also get_author_ident_from_commit() in git-sh-setup.sh and Documentation/git-sh-setup.txt can be removed, git-rebase--preserve-merges.sh is the last user of it.

I looked over the other git-sh-setup functions, it seems that's the only one that could be removed along with git-rebase--preserve-merges.sh.

Although with git-rebase--preserve-merges.sh gone the get_author_ident_from_commit(), parse_ident_from_commit() and pick_ident_script() can all be moved to its last user:
git-filter-branch.sh

Hi Ævar,

s/last user/last in-tree user/

Since we install git-sh-i18n and semi-advertised it as something to use in user scripts (which makes removing it somewhat questionable a goal, certainly when you do not even offer a deprecation period), and since the removal of such things is completely orthogonal to the intention of this patch series, I will not include this patch, let alone squash it into a commit whose purpose has nothing to do with gettext whatsoever.

Ciao,
Johannes

Unlike whatever controversy we're having over git-sh-setup being removed (see <[email protected]>[1]), the git-sh-i18n's gettext() and eval_gettext() can't be useful to anyone out of git.git's tree, since they accept strings that are expected to be found in git.git's generated *.mo files.

So it's certainly possible that someone's used out out-of-tree, but that use of eval_gettext() won't have been doing anything useful in terms of translation, and if it did that would have been because someone copied a to-be-translated string as-is, and expected git.git to keep it byte-for-byte the same as their sources.

Anyway, if you don't want to squash this in I can submit it as some sort of follow-up, perhaps along with some of the suggestions in <[email protected]>[2] if you're generally aiming to keep the changes here to the depth of the first callstack, i.e. remove the --preserve-merges use of a foo(), but not a foo() function itself if that foo() then becomes orphaned as a result.

1. https://lore.kernel.org/git/[email protected]/
2. https://lore.kernel.org/git/[email protected]/

True but removing it is probably outside the scope of this series. Removal of helper functions from sh-i18n can be discussed once the dust from this topic settles ("now the last caller of the helper is gone from 'master', we can remove X, Y and Z").

Hi dscho

This all looks good to me. I did see the comment below in builtin/rebase.c that could be tweaked if you reroll, but it is a very minor issue.

/* -i followed by -p is still explicitly interactive, but -p alone is not */ static int parse_opt_interactive(const struct option *opt, const char *arg,
int unset)

I do wonder if we need these option parsing functions now but that is a question for another day.

Best Wishes

Phillip

Hi Phillip,

Right, without -p this comment does not make sense anymore. But once I replace the -p by -r, it _does_ make sense: git rebase -r is not interactive, but git rebase -ir _is_.

As the function parses the -i/--interactive option, which is not going anywhere, we still need it.

Thanks,
Dscho

Hi Dscho

Sure I was just wondering if we could simplify things by using something like OPT_BOOL rather than OPT_CALLBACK_F for "--am", "-i" and "-m". I haven't looked too closely though

Thanks again for this series
Best Wishes

Phillip

Hi Phillip,

It's definitely a good question, and I wondered, too, but failed to share my conclusions with you.

The callback does two things: first, it switches the rebase type to merge, and then it also sets the flag (by setting a bit in the bit field) that the rebase is explicitly interactive.

The reason for this "explicitly interactive" wording is historical, of course, because historically some functionality was implemented by git-rebase--interactive.sh even if the rebase itself was intended _not_ to be run interactively. Think git rebase --exec <command>, for example.

These days, it is still true that rebase-interactive.c implements some functionality that is not necessarily meant to be executed interactively (again, --exec, but also --rebase-merges).

So there _is_ a need for that option to do more than one thing, and as some options can try to set, say, the rebase type, it is important to handle those options immediately (as opposed to trying to set a flag based on --interactive and then trying to infer the rebase type from that flag _after_ parse_options() is done).

Ciao,
Dscho

From: Johannes Schindelin <[email protected]>

We already passed the --rebase-merges option to git rebase instead, now we make this move permanent.

---
 Documentation/git-svn.txt | 1 -
 git-svn.perl              | 1 -
 2 files changed, 2 deletions(-)

index d5776ffcfd5..222b556d7a9 100644
@@ -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

index 70cb5e2a83b..be987e316f9 100755
@@ -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',

gitgitgadget

Unlike the cover letter's claim of deprecated since v2.22, this in particular has only been deprecated since v2.25, i.e. your follow-up ea8b7be1476 (git svn: stop using rebase --preserve-merges, 2019-11-22).

I think it's fine to do this, but at least updating the commit message to note the difference would be good.

Hi Ævar,

I will update the commit message.

Ciao,
Dscho

Hi Ævar,

Thank you for being super rigorous.

Ciao,
Dscho

From: Johannes Schindelin <[email protected]>

It was only used by the --preserve-merges backend, which we just removed.

---
 builtin/rebase.c | 185 -----------------------------------------------
 git.c            |   1 -
 2 files changed, 186 deletions(-)

index 5af6aff9c5e..d707e3604e7 100644
@@ -178,81 +178,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();

@@ -437,24 +362,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);
 	}

@@ -476,98 +383,6 @@ 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);
-
-	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;

index 18bed9a9964..268cdd82cfc 100644
@@ -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 },

gitgitgadget

Hi dscho

Thanks for working on this, it opens up the possibility of future cleanups now we're not constrained by supporting cmd_rebase__interactive()