Drop support for git rebase --preserve-merges
Status from this message: Nack, it breaks existing usages. Why the urgency with removal?
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | t5520: do not use `pull.rebase=preserve`t/ | +3 | 0 replies | |
| 2/8 | remote: warn about unhandled branch.<name>.rebase valuesbuiltin/ | +3 | 0 replies | |
| 3/8 | tests: stop testing `git rebase --preserve-merges`azure-pipelines.yml t/ t/ +14 more | +0 | 0 replies | |
| 4/8 | pull: remove support for `--rebase=preserve`Documentation/ Documentation/ Documentation/ +2 more | +5 | 0 replies | |
| 5/8 | rebase: drop support for `--preserve-merges`.gitignore Documentation/ Makefile +2 more | +6 | 0 replies | |
| 6/8 | git-svn: drop support for `--preserve-merges`Documentation/ git-svn.perl | +0 | 3 replies | |
| 7/8 | rebase: drop the internal `rebase--interactive` commandbuiltin/ git.c | +0 | 0 replies | |
| 8/8 | remote: no longer claim that branch.*.rebase=preserve is a thingbuiltin/ | +0 | 0 replies |
Reviews trailers per patch
None of the 8 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Ævar Arnfjörð Bjarmason | Alban Gruin | Phillip Wood |
|---|---|---|---|
| Series | R-b R-b | Helped-by Helped-by Helped-by | Helped-by |
| 1/8 | |||
| 2/8 | |||
| 3/8 | |||
| 4/8 | |||
| 5/8 | |||
| 6/8 | |||
| 7/8 | |||
| 8/8 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [PATCH 0/8] 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
Signature · 1 line
gitgitgadget