[PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames.
- From
Jason Merrill <jason@redhat.com>
- Date
- Sep 15, 2017, 21:46 UTC
- Message-ID
- <20170915214653.14720-1-jason@redhat.com>
- In-Reply-To
- <CADzB+2mxyXcROYx72tac8cUxBMxi=ZxUNQYxpUR1CZ43e-j9gA@mail.gmail.com>
Previously, svn dcommit of a merge with svn.pushmergeinfo set would get error messages like "merge parent <X> for <Y> is on branch svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root svn+ssh://jason@gcc.gnu.org/svn/gcc!"
So, let's call remove_username (as we do for svn info) before comparing rooturl to branchurl.
Signed-off-by: Jason Merrill <jason@redhat.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> --- git-svn.perl | 1 + 1 file changed, 1 insertion(+)
diff --git a/git-svn.perl b/git-svn.perl index fa42364785..3b95d67bde 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -931,6 +931,7 @@ sub cmd_dcommit { # information from different SVN repos, and paths # which are not underneath this repository root. my $rooturl = $gs->repos_root; + Git::SVN::remove_username($rooturl); foreach my $d (@$linear_refs) { my %parentshash; read_commit_parents(\%parentshash, $d);
-- 2.13.5