diff options
| author | Jason Merrill <jason@redhat.com> | 2017-09-15 17:46:53 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-17 10:06:22 +0900 |
| commit | 8aaed892fd50f2d82caebe964994e0d55695667a (patch) | |
| tree | 745d68dce64bef010f658fbd57932c788604d576 /builtin/diff-index.c | |
| parent | 94c9fd268d4287f6fbfef84793288479905a7e48 (diff) | |
| download | git-8aaed892fd50f2d82caebe964994e0d55695667a.tar.gz | |
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fix
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>
Diffstat (limited to 'builtin/diff-index.c')
0 files changed, 0 insertions, 0 deletions