mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
Merge branch 'jm/svn-pushmergeinfo-fix'
"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.
This commit is contained in:
commit
a713fb59e7
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user