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 | |
| parent | RelNotes: further fixes for 2.14.2 from the master front (diff) | |
| download | tgif-8aaed892fd50f2d82caebe964994e0d55695667a.tar.xz | |
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>
| -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 d2404184ba..0b60c23e2f 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); |