Merge branch 'rs/check-ignore-multi'

[thirdparty/git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index aa242d4f4f4363736730ccfcb4c2694d5be9a670..a6b6c3e40c180e58186f9ef8af5c6fd6fc654080 100755 (executable)
--- 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);
@@ -1199,6 +1200,11 @@ sub cmd_branch {
        $ctx->copy($src, $rev, $dst)
                unless $_dry_run;
 
+       # Release resources held by ctx before creating another SVN::Ra
+       # so destruction is orderly.  This seems necessary with SVN 1.9.5
+       # to avoid segfaults.
+       $ctx = undef;
+
        $gs->fetch_all;
 }