From ea8b7be1476a2301e3658a8e626b69c9d7f540bd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 22 Nov 2019 22:59:29 +0000 Subject: git svn: stop using `rebase --preserve-merges` We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's reflect that in `git svn`. Note: Even when the user asks for `--preserve-merges`, we now silently pass `--rebase-merges` to `git rebase` instead. Technically, this is a change of behavior. But practically, `git svn` only ever asks for a non-interactive rebase, and `--preserve-merges` and `--rebase-merges` are on par with regard to that. Signed-off-by: Johannes Schindelin Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- git-svn.perl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'git-svn.perl') diff --git a/git-svn.perl b/git-svn.perl index 050f2a36f4..4aa208ff5f 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -110,7 +110,7 @@ my ($_stdin, $_help, $_edit, $_template, $_shared, $_version, $_fetch_all, $_no_rebase, $_fetch_parent, $_before, $_after, - $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, + $_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); @@ -270,7 +270,8 @@ my %cmd = ( 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, 'dry-run|n' => \$_dry_run, - 'preserve-merges|p' => \$_preserve_merges, + 'rebase-merges|p' => \$_rebase_merges, + 'preserve-merges|p' => \$_rebase_merges, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', @@ -1054,7 +1055,7 @@ sub cmd_dcommit { 'If you are attempting to commit ', "merges, try running:\n\t", 'git rebase --interactive', - '--preserve-merges ', + '--rebase-merges ', $gs->refname, "\nBefore dcommitting"; } @@ -1717,7 +1718,7 @@ sub rebase_cmd { push @cmd, '-v' if $_verbose; push @cmd, qw/--merge/ if $_merge; push @cmd, "--strategy=$_strategy" if $_strategy; - push @cmd, "--preserve-merges" if $_preserve_merges; + push @cmd, "--rebase-merges" if $_rebase_merges; @cmd; } -- cgit v1.2.3