Skip to content

Commit 04afcc2

Browse files
committed
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.
2 parents 468dc22 + 8aaed89 commit 04afcc2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-svn.perl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ sub cmd_dcommit {
931931
# information from different SVN repos, and paths
932932
# which are not underneath this repository root.
933933
my $rooturl = $gs->repos_root;
934+
Git::SVN::remove_username($rooturl);
934935
foreach my $d (@$linear_refs) {
935936
my %parentshash;
936937
read_commit_parents(\%parentshash, $d);

0 commit comments

Comments
 (0)