diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 21:16:36 (GMT) |
| commit | a713fb59e701065efefb82cc862a889d96d6a9c6 (patch) | |
| tree | 861157d070250537e89def246feed35cb294e446 /git-svn.perl | |
| parent | bc3dca07f435ed2ca5a974cdb0508f66cf442412 (diff) | |
| parent | 8aaed892fd50f2d82caebe964994e0d55695667a (diff) | |
| download | git-a713fb59e701065efefb82cc862a889d96d6a9c6.zip git-a713fb59e701065efefb82cc862a889d96d6a9c6.tar.gz git-a713fb59e701065efefb82cc862a889d96d6a9c6.tar.bz2 | |
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.
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index aa242d4..76a75d0 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); |