]> git.ipfire.org Git - thirdparty/git.git/commit - git-svn.perl
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
authorJason Merrill <jason@redhat.com>
Fri, 15 Sep 2017 21:46:53 +0000 (17:46 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Sep 2017 01:06:22 +0000 (10:06 +0900)
commit8aaed892fd50f2d82caebe964994e0d55695667a
tree745d68dce64bef010f658fbd57932c788604d576
parent94c9fd268d4287f6fbfef84793288479905a7e48
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.

Previously, svn dcommit of a merge with svn.pushmergeinfo set would
get error messages like "merge parent <X> for <Y> is on branch
svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root
svn+ssh://jason@gcc.gnu.org/svn/gcc!"

So, let's call remove_username (as we do for svn info) before comparing
rooturl to branchurl.

Signed-off-by: Jason Merrill <jason@redhat.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-svn.perl