@matheusbsbs / matheus-bagliano / commits / 0a159d65d6

git-svn: drop support for `--preserve-merges`

We already passed the `--rebase-merges` option to `git rebase` instead, now we make this move permanent. As pointed out by Ævar Arnfjörð Bjarmason, in contrast to the deprecation of `git rebase`'s `--preserve-merges` backend, `git svn` only deprecated this option in v2.25.0 (because this developer missed `git svn`'s use of that backend when deprecating the rebase backend running up to Git v2.22). Still, v2.25.0 has been released on January 13th, 2020. In other words, `git svn` deprecated this option over one and a half years ago, _and_ has been redirecting to the `--rebase-merges` option during all that time (read: `git svn rebase --preserve-merges` didn't do _precisely_ what the user asked, since v2.25.0, anyway, it fell back to pretending that the user asked for `git svn rebase --rebase-merges` instead). It is time to act on that deprecation and remove that option after all. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Sep 7, 2021 at 21:05 UTC 0a159d65d6f30154a70ab83b52e9f772901862b1

2 files changed -2

Documentation/git-svn.txt

-1

@@ -678,7 +678,6 @@ config key: svn.authorsProg

678 --strategy=<strategy>::

679 -p::

680 --rebase-merges::

681 ---preserve-merges (DEPRECATED)::

681 These are only used with the 'dcommit' and 'rebase' commands.

682 +

683 Passed directly to 'git rebase' when using 'dcommit' if a

git-svn.perl

-1

@@ -273,7 +273,6 @@ my %cmd = (

273 'fetch-all|all' => \$_fetch_all,

274 'dry-run|n' => \$_dry_run,

275 'rebase-merges|p' => \$_rebase_merges,

276 - 'preserve-merges|p' => \$_rebase_merges,

276 %fc_opts } ],

277 'commit-diff' => [ \&cmd_commit_diff,

278 'Commit a diff between two trees',