undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2021-09-07 21:05:07 +00:00 committed by Junio C Hamano
parent a74b35081c
commit 0a159d65d6
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-svn.txt
View File

@ -678,7 +678,6 @@ config key: svn.authorsProg
--strategy=<strategy>:: --strategy=<strategy>::
-p:: -p::
--rebase-merges:: --rebase-merges::
--preserve-merges (DEPRECATED)::
These are only used with the 'dcommit' and 'rebase' commands. These are only used with the 'dcommit' and 'rebase' commands.
+ +
Passed directly to 'git rebase' when using 'dcommit' if a Passed directly to 'git rebase' when using 'dcommit' if a

1
git-svn.perl
View File

@ -273,7 +273,6 @@ my %cmd = (
'fetch-all|all' => \$_fetch_all, 'fetch-all|all' => \$_fetch_all,
'dry-run|n' => \$_dry_run, 'dry-run|n' => \$_dry_run,
'rebase-merges|p' => \$_rebase_merges, 'rebase-merges|p' => \$_rebase_merges,
'preserve-merges|p' => \$_rebase_merges,
%fc_opts } ], %fc_opts } ],
'commit-diff' => [ \&cmd_commit_diff, 'commit-diff' => [ \&cmd_commit_diff,
'Commit a diff between two trees', 'Commit a diff between two trees',