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)
commit04afcc2201ddb399031484eb9769393bade2529d
treef380f912c70e495678c223f0efc00dd14e471d6c
parent468dc22e0085db29994b4296ca0127f27a686fa0
parent8aaed892fd50f2d82caebe964994e0d55695667a
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.
git-svn.perl