git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jason Merrill committed
Sep 15, 2017 at 17:46 UTC
8aaed892fd50f2d82caebe964994e0d55695667a
1 file changed
+1
git-svn.perl
+1
@@ -931,6 +931,7 @@ sub cmd_dcommit {
931
# information from different SVN repos, and paths
932
# which are not underneath this repository root.
933
my $rooturl = $gs->repos_root;
934
+ Git::SVN::remove_username($rooturl);
935
foreach my $d (@$linear_refs) {
936
my %parentshash;
937
read_commit_parents(\%parentshash, $d);