Merge branch 'jm/svn-pushmergeinfo-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:11 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:11 +0000 (15:18 -0800)
"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.

1  2 
git-svn.perl

diff --cc git-svn.perl
Simple merge