kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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.
maint
Junio C Hamano 2018-01-23 13:16:36 -08:00
parent bc3dca07f4 8aaed892fd
commit a713fb59e7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-svn.perl
View File

@ -931,6 +931,7 @@ sub cmd_dcommit {
# information from different SVN repos, and paths # information from different SVN repos, and paths
# which are not underneath this repository root. # which are not underneath this repository root.
my $rooturl = $gs->repos_root; my $rooturl = $gs->repos_root;
Git::SVN::remove_username($rooturl);
foreach my $d (@$linear_refs) { foreach my $d (@$linear_refs) {
my %parentshash; my %parentshash;
read_commit_parents(\%parentshash, $d); read_commit_parents(\%parentshash, $d);