diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:11 -0800 |
commit | 04afcc2201ddb399031484eb9769393bade2529d (patch) | |
tree | f380f912c70e495678c223f0efc00dd14e471d6c | |
parent | 468dc22e0085db29994b4296ca0127f27a686fa0 (diff) | |
parent | 8aaed892fd50f2d82caebe964994e0d55695667a (diff) | |
download | git-04afcc2201ddb399031484eb9769393bade2529d.tar.gz |
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.
-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 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); |