Skip to content

Commit 8aaed89

Browse files
jicamagitster
authored andcommitted
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://[email protected]/svn/gcc!" So, let's call remove_username (as we do for svn info) before comparing rooturl to branchurl. Signed-off-by: Jason Merrill <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 94c9fd2 commit 8aaed89

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-svn.perl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ sub cmd_dcommit {
931931
# information from different SVN repos, and paths
932932
# which are not underneath this repository root.
933933
my $rooturl = $gs->repos_root;
934+
Git::SVN::remove_username($rooturl);
934935
foreach my $d (@$linear_refs) {
935936
my %parentshash;
936937
read_commit_parents(\%parentshash, $d);

0 commit comments

Comments
 (0)