diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
commit | 34b9ec8dd9bf6d3f6fa04f295351f917042a33fa (patch) | |
tree | 6a51403550c6e8f5b11bf70ebb615539e23cdf43 | |
parent | 091853a1aad7e337ac24a55c466820db41ad1026 (diff) | |
parent | 7f6f75e97acd25f8e95ce431e16d2e1c2093845d (diff) | |
download | git-34b9ec8dd9bf6d3f6fa04f295351f917042a33fa.tar.gz |
Merge branch 'ew/svn-branch-segfault-fix' into maint
Workaround for segfault with more recent versions of SVN.
* ew/svn-branch-segfault-fix:
git-svn: control destruction order to avoid segfault
-rwxr-xr-x | git-svn.perl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index 76a75d0b3d..a6b6c3e40c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1200,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; } |