From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 23:18:11 +0000 (-0800)
Subject: Merge branch 'jm/svn-pushmergeinfo-fix' into maint
X-Git-Tag: v2.16.2~8
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/04afcc2201ddb399031484eb9769393bade2529d?hp=468dc22e0085db29994b4296ca0127f27a686fa0

Merge branch 'jm/svn-pushmergeinfo-fix' into maint

"git svn dcommit" did not take into account the fact that a
svn+ssh:// URL with a username@ (typically used for pushing) refers
to the same SVN repository without the username@ and failed when
svn.pushmergeinfo option is set.

* jm/svn-pushmergeinfo-fix:
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
---

diff --git a/git-svn.perl b/git-svn.perl
index aa242d4f4f..76a75d0b3d 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);