Overload Base.close instead of Base.finalize for LibGit2

Fixes #17414.

Author: simonbyrne

base/deprecated.jl

@@ -1154,4 +1154,9 @@ for (dep, f, op) in [(:sumabs!, :sum!, :abs),
     end
 end
 
+@deprecate finalize(sa::LibGit2.StrArrayStruct) close(sa)
+@deprecate finalize(sa::LibGit2.Buffer) close(sa)
+@deprecate finalize(sa::LibGit2.AbstractGitObject) close(sa)
+
+
 # End deprecations scheduled for 0.6

base/libgit2/callbacks.jl

@@ -18,7 +18,7 @@ function mirror_callback(remote::Ptr{Ptr{Void}}, repo_ptr::Ptr{Void},
     name_str = unsafe_string(name)
     err= try set!(config, "remote.$name_str.mirror", true)
          catch -1
-         finally finalize(config)
+         finally close(config)
          end
     err != 0 && return Cint(err)
     return Cint(0)

base/libgit2/commit.jl

@@ -79,11 +79,11 @@ function commit(repo::GitRepo, msg::AbstractString;
         commit_id = commit(repo, refname, msg, auth_sig, comm_sig, tree, parents...)
     finally
         for parent in parents
-            finalize(parent)
+            close(parent)
         end
-        finalize(tree)
-        finalize(auth_sig)
-        finalize(comm_sig)
+        close(tree)
+        close(auth_sig)
+        close(comm_sig)
     end
     return commit_id
 end

base/libgit2/config.jl

@@ -10,8 +10,8 @@ function GitConfig(path::AbstractString,
     try
         addfile(cfg, path, level, force)
     catch ex
-        finalize(cfg)
-        throw(ex)
+        close(cfg)
+        rethrow(ex)
     end
     return cfg
 end
@@ -37,7 +37,7 @@ function GitConfig(level::Consts.GIT_CONFIG = Consts.CONFIG_LEVEL_DEFAULT)
                           glb_cfg_ptr_ptr, cfg.ptr, Cint(level))
             cfg = GitConfig(glb_cfg_ptr_ptr[])
         finally
-            finalize(tmpcfg)
+            close(tmpcfg)
         end
     end
     return cfg

base/libgit2/diff.jl

@@ -18,7 +18,7 @@ function diff_tree(repo::GitRepo, tree::GitTree, pathspecs::AbstractString=""; c
                            diff_ptr_ptr, repo.ptr, tree.ptr, emptypathspec ? C_NULL : Ref(diff_opts))
         end
     finally
-        !emptypathspec && finalize(sa)
+        !emptypathspec && close(sa)
     end
     return GitDiff(diff_ptr_ptr[])
 end

base/libgit2/index.jl

@@ -37,7 +37,7 @@ function read_tree!(idx::GitIndex, tree_id::Oid)
         @check ccall((:git_index_read_tree, :libgit2), Cint,
                      (Ptr{Void}, Ptr{Void}), idx.ptr, tree.ptr)
     finally
-        finalize(tree)
+        close(tree)
     end
 end
 
@@ -49,7 +49,7 @@ function add!{T<:AbstractString}(idx::GitIndex, files::T...;
                      (Ptr{Void}, Ptr{StrArrayStruct}, Cuint, Ptr{Void}, Ptr{Void}),
                       idx.ptr, Ref(sa), flags, C_NULL, C_NULL)
     finally
-        finalize(sa)
+        close(sa)
     end
 end
 
@@ -60,7 +60,7 @@ function update!{T<:AbstractString}(idx::GitIndex, files::T...)
                      (Ptr{Void}, Ptr{StrArrayStruct}, Ptr{Void}, Ptr{Void}),
                       idx.ptr, Ref(sa), C_NULL, C_NULL)
     finally
-        finalize(sa)
+        close(sa)
     end
 end
 
@@ -71,7 +71,7 @@ function remove!{T<:AbstractString}(idx::GitIndex, files::T...)
                      (Ptr{Void}, Ptr{StrArrayStruct}, Ptr{Void}, Ptr{Void}),
                       idx.ptr, Ref(sa), C_NULL, C_NULL)
     finally
-        finalize(sa)
+        close(sa)
     end
 end
 

base/libgit2/libgit2.jl

@@ -63,7 +63,7 @@ function iscommit(id::AbstractString, repo::GitRepo)
         if c === nothing
             res = false
         else
-            finalize(c)
+            close(c)
         end
     catch
         res = false
@@ -84,11 +84,11 @@ function isdiff(repo::GitRepo, treeish::AbstractString, paths::AbstractString=""
     try
         diff = diff_tree(repo, tree, paths)
         result = count(diff) > 0
-        finalize(diff)
+        close(diff)
     catch err
         result = true
     finally
-        finalize(tree)
+        close(tree)
     end
     return result
 end
@@ -110,10 +110,10 @@ function diff_files(repo::GitRepo, branch1::AbstractString, branch2::AbstractStr
                 push!(files, unsafe_string(delta.new_file.path))
             end
         end
-        finalize(diff)
+        close(diff)
     finally
-        finalize(tree1)
-        finalize(tree2)
+        close(tree1)
+        close(tree2)
     end
     return files
 end
@@ -163,7 +163,7 @@ function fetch{T<:AbstractString, P<:AbstractCredentials}(repo::GitRepo;
         fo = FetchOptions(callbacks=RemoteCallbacks(credentials_cb(), payload))
         fetch(rmt, refspecs, msg="from $(url(rmt))", options = fo)
     finally
-        finalize(rmt)
+        close(rmt)
     end
 end
 
@@ -184,7 +184,7 @@ function push{T<:AbstractString, P<:AbstractCredentials}(repo::GitRepo;
         push_opts=PushOptions(callbacks=RemoteCallbacks(credentials_cb(), payload))
         push(rmt, refspecs, force=force, options=push_opts)
     finally
-        finalize(rmt)
+        close(rmt)
     end
 end
 
@@ -194,7 +194,7 @@ function branch(repo::GitRepo)
     try
         branch(head_ref)
     finally
-        finalize(head_ref)
+        close(head_ref)
     end
 end
 
@@ -220,7 +220,7 @@ function branch!(repo::GitRepo, branch_name::AbstractString,
                 tmpcmt = with(peel(GitCommit, branch_rmt_ref)) do hrc
                     Oid(hrc)
                 end
-                finalize(branch_rmt_ref)
+                close(branch_rmt_ref)
                 tmpcmt
             end
         else
@@ -232,7 +232,7 @@ function branch!(repo::GitRepo, branch_name::AbstractString,
         try
             new_branch_ref = create_branch(repo, branch_name, cmt, force=force)
         finally
-            finalize(cmt)
+            close(cmt)
             new_branch_ref === nothing && throw(GitError(Error.Object, Error.ERROR, "cannot create branch `$branch_name` with `$commit_id`"))
             branch_ref = new_branch_ref
         end
@@ -260,7 +260,7 @@ function branch!(repo::GitRepo, branch_name::AbstractString,
             head!(repo, branch_ref)
         end
     finally
-        finalize(branch_ref)
+        close(branch_ref)
     end
     return
 end
@@ -296,15 +296,15 @@ function checkout!(repo::GitRepo, commit::AbstractString = "";
             obj_oid = Oid(peeled)
             ref = GitReference(repo, obj_oid, force=force,
                 msg="libgit2.checkout: moving from $head_name to $(string(obj_oid))")
-            finalize(ref)
+            close(ref)
 
             # checkout commit
             checkout_tree(repo, peeled, options = opts)
         finally
-            finalize(peeled)
+            close(peeled)
         end
     finally
-        finalize(obj)
+        close(obj)
     end
 end
 
@@ -335,7 +335,7 @@ function reset!(repo::GitRepo, committish::AbstractString, pathspecs::AbstractSt
     try
         reset!(repo, Nullable(obj), pathspecs...)
     finally
-        finalize(obj)
+        close(obj)
     end
 end
 
@@ -347,7 +347,7 @@ function reset!(repo::GitRepo, commit::Oid, mode::Cint = Consts.RESET_MIXED)
     try
         reset!(repo, obj, mode)
     finally
-        finalize(obj)
+        close(obj)
     end
 end
 
@@ -409,12 +409,15 @@ function merge!(repo::GitRepo;
                     throw(GitError(Error.Merge, Error.ERROR,
                                    "Repository HEAD is detached. Remote tracking branch cannot be used."))
                 end
-                with(upstream(head_ref)) do tr_brn_ref
-                    if tr_brn_ref === nothing
-                        throw(GitError(Error.Merge, Error.ERROR,
-                                       "There is no tracking information for the current branch."))
-                    end
+                tr_brn_ref = upstream(head_ref)
+                if tr_brn_ref === nothing
+                    throw(GitError(Error.Merge, Error.ERROR,
+                                   "There is no tracking information for the current branch."))
+                end
+                try
                     [GitAnnotated(repo, tr_brn_ref)]
+                finally
+                    close(tr_brn_ref)
                 end
             end
         end
@@ -424,7 +427,7 @@ function merge!(repo::GitRepo;
                    merge_opts=merge_opts,
                    checkout_opts=checkout_opts)
         finally
-            map(finalize, upst_anns)
+            map(close, upst_anns)
         end
     end
 end
@@ -434,12 +437,15 @@ function rebase!(repo::GitRepo, upstream::AbstractString="", newbase::AbstractSt
     with(head(repo)) do head_ref
         head_ann = GitAnnotated(repo, head_ref)
         upst_ann  = if isempty(upstream)
-            with(LibGit2.upstream(head_ref)) do brn_ref
-                if brn_ref === nothing
-                    throw(GitError(Error.Rebase, Error.ERROR,
-                                   "There is no tracking information for the current branch."))
-                end
+            brn_ref = LibGit2.upstream(head_ref)
+            if brn_ref === nothing
+                throw(GitError(Error.Rebase, Error.ERROR,
+                               "There is no tracking information for the current branch."))
+            end
+            try
                 GitAnnotated(repo, brn_ref)
+            finally
+                close(brn_ref)
             end
         else
             GitAnnotated(repo, upstream)
@@ -456,15 +462,15 @@ function rebase!(repo::GitRepo, upstream::AbstractString="", newbase::AbstractSt
                 catch err
                     abort(rbs)
                 finally
-                    finalize(rbs)
+                    close(rbs)
                 end
             finally
-                #!isnull(onto_ann) && finalize(get(onto_ann))
-                finalize(sig)
+                #!isnull(onto_ann) && close(get(onto_ann))
+                close(sig)
             end
         finally
-            finalize(upst_ann)
-            finalize(head_ann)
+            close(upst_ann)
+            close(head_ann)
         end
     end
     return nothing
@@ -522,7 +528,7 @@ function transact(f::Function, repo::GitRepo)
         restore(state, repo)
         rethrow()
     finally
-        finalize(repo)
+        close(repo)
     end
 end
 

base/libgit2/merge.jl

@@ -31,7 +31,7 @@ function GitAnnotated(repo::GitRepo, comittish::AbstractString)
         cmt === nothing && return nothing
         return GitAnnotated(repo, Oid(cmt))
     finally
-        finalize(obj)
+        close(obj)
     end
 end
 
@@ -65,10 +65,10 @@ function ffmerge!(repo::GitRepo, ann::GitAnnotated)
             else
                 GitReference(repo, cmt_oid, fullname(head_ref), msg=msg)
             end
-            finalize(new_head_ref)
+            close(new_head_ref)
         end
     finally
-        finalize(cmt)
+        close(cmt)
     end
     return true
 end

base/libgit2/reference.jl

@@ -96,7 +96,7 @@ function peel{T <: GitObject}(::Type{T}, ref::GitReference)
         return Oid()
     elseif err != Int(Error.GIT_OK)
         if obj_ptr_ptr[] != C_NULL
-            finalize(GitAnyObject(obj_ptr_ptr[]))
+            close(GitAnyObject(obj_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end
@@ -146,7 +146,7 @@ function lookup_branch(repo::GitRepo,
         return nothing
     elseif err != Int(Error.GIT_OK)
         if ref_ptr_ptr[] != C_NULL
-            finalize(GitReference(ref_ptr_ptr[]))
+            close(GitReference(ref_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end
@@ -162,7 +162,7 @@ function upstream(ref::GitReference)
         return nothing
     elseif err != Int(Error.GIT_OK)
         if ref_ptr_ptr[] != C_NULL
-            finalize(GitReference(ref_ptr_ptr[]))
+            close(GitReference(ref_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end

base/libgit2/remote.jl

@@ -45,7 +45,7 @@ function fetch_refspecs(rmt::GitRemote)
                       (Ptr{LibGit2.StrArrayStruct}, Ptr{Void}), sa_ref, rmt.ptr)
         convert(Vector{AbstractString}, sa_ref[])
     finally
-        finalize(sa_ref[])
+        close(sa_ref[])
     end
 end
 
@@ -56,7 +56,7 @@ function push_refspecs(rmt::GitRemote)
                       (Ptr{LibGit2.StrArrayStruct}, Ptr{Void}), sa_ref, rmt.ptr)
         convert(Vector{AbstractString}, sa_ref[])
     finally
-        finalize(sa_ref[])
+        close(sa_ref[])
     end
 end
 
@@ -71,7 +71,7 @@ function fetch{T<:AbstractString}(rmt::GitRemote, refspecs::Vector{T};
             (Ptr{Void}, Ptr{StrArrayStruct}, Ptr{FetchOptions}, Cstring),
             rmt.ptr, no_refs ? C_NULL : Ref(sa), Ref(options), msg)
     finally
-        !no_refs && finalize(sa)
+        !no_refs && close(sa)
     end
 end
 
@@ -85,6 +85,6 @@ function push{T<:AbstractString}(rmt::GitRemote, refspecs::Vector{T};
                       (Ptr{Void}, Ptr{StrArrayStruct}, Ptr{PushOptions}),
                        rmt.ptr, no_refs ? C_NULL : Ref(sa), Ref(options))
     finally
-        !no_refs && finalize(sa)
+        !no_refs && close(sa)
     end
 end

base/libgit2/repository.jl

@@ -6,7 +6,7 @@ function GitRepo(path::AbstractString)
                 (Ptr{Ptr{Void}}, Cstring), repo_ptr_ptr, path)
     if err != Int(Error.GIT_OK)
         if repo_ptr_ptr[] != C_NULL
-            finalize(GitRepo(repo_ptr_ptr[]))
+            close(GitRepo(repo_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end
@@ -21,7 +21,7 @@ function GitRepoExt(path::AbstractString, flags::Cuint = Cuint(Consts.REPOSITORY
                  repo_ptr_ptr, path, flags, separator)
     if err != Int(Error.GIT_OK)
         if repo_ptr_ptr[] != C_NULL
-            finalize(GitRepo(repo_ptr_ptr[]))
+            close(GitRepo(repo_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end
@@ -46,7 +46,7 @@ function head_oid(repo::GitRepo)
     try
         return Oid(head_ref)
     finally
-        finalize(head_ref)
+        close(head_ref)
     end
 end
 
@@ -82,7 +82,7 @@ function revparseid(repo::GitRepo, objname::AbstractString)
     obj = revparse(repo, objname)
     obj === nothing && return Oid()
     oid = Oid(obj.ptr)
-    finalize(obj)
+    close(obj)
     return oid
 end
 
@@ -104,7 +104,7 @@ function get{T <: GitObject}(::Type{T}, r::GitRepo, oid::Oid, oid_size::Int=OID_
         return nothing
     elseif err != Int(Error.GIT_OK)
         if obj_ptr_ptr[] != C_NULL
-            finalize(GitAnyObject(obj_ptr_ptr[]))
+            close(GitAnyObject(obj_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end
@@ -134,7 +134,7 @@ function peel(obj::GitObject, obj_type::Cint)
         return Oid()
     elseif err != Int(Error.GIT_OK)
         if peeled_ptr_ptr[] != C_NULL
-            finalize(GitAnyObject(peeled_ptr_ptr[]))
+            close(GitAnyObject(peeled_ptr_ptr[]))
         end
         throw(Error.GitError(err))
     end

base/libgit2/signature.jl

@@ -16,14 +16,14 @@ function Signature(name::AbstractString, email::AbstractString)
                  (Ptr{Ptr{SignatureStruct}}, Cstring, Cstring), sig_ptr_ptr, name, email)
     sig = GitSignature(sig_ptr_ptr[])
     s = Signature(sig.ptr)
-    finalize(sig)
+    close(sig)
     return s
 end
 
 function Signature(repo::GitRepo)
     sig = default_signature(repo)
     s = Signature(sig.ptr)
-    finalize(sig)
+    close(sig)
     return s
 end
 

base/libgit2/types.jl

@@ -32,7 +32,7 @@ immutable StrArrayStruct
    count::Csize_t
 end
 StrArrayStruct() = StrArrayStruct(Ptr{Cstring}(C_NULL), zero(Csize_t))
-function Base.finalize(sa::StrArrayStruct)
+function Base.close(sa::StrArrayStruct)
     sa_ptr = Ref(sa)
     ccall((:git_strarray_free, :libgit2), Void, (Ptr{StrArrayStruct},), sa_ptr)
     return sa_ptr[]
@@ -44,7 +44,7 @@ immutable Buffer
     size::Csize_t
 end
 Buffer() = Buffer(Ptr{Cchar}(C_NULL), zero(Csize_t), zero(Csize_t))
-function Base.finalize(buf::Buffer)
+function Base.close(buf::Buffer)
     buf_ptr = Ref(buf)
     ccall((:git_buf_free, :libgit2), Void, (Ptr{Buffer},), buf_ptr)
     return buf_ptr[]
@@ -574,7 +574,7 @@ abstract AbstractGitObject
 Base.isempty(obj::AbstractGitObject) = (obj.ptr == C_NULL)
 
 abstract GitObject <: AbstractGitObject
-function Base.finalize(obj::GitObject)
+function Base.close(obj::GitObject)
     if obj.ptr != C_NULL
         ccall((:git_object_free, :libgit2), Void, (Ptr{Void},), obj.ptr)
         obj.ptr = C_NULL
@@ -613,7 +613,7 @@ for (typ, ref, sup, fnc) in (
     end
 
     if fnc !== nothing
-        @eval function Base.finalize(obj::$typ)
+        @eval function Base.close(obj::$typ)
             if obj.ptr != C_NULL
                 ccall(($fnc, :libgit2), Void, (Ptr{$ref},), obj.ptr)
                 obj.ptr = C_NULL
@@ -637,7 +637,7 @@ function with(f::Function, obj)
     try
         f(obj)
     finally
-        finalize(obj)
+        close(obj)
     end
 end
 

base/pkg/cache.jl

@@ -66,7 +66,7 @@ function prefetch(pkg::AbstractString, url::AbstractString, sha1s::Vector)
         end
         sha1s[!in_cache]
     finally
-        finalize(repo) # closing repo opened/created above
+        close(repo) # closing repo opened/created above
     end
 end
 prefetch(pkg::AbstractString, url::AbstractString, sha1::AbstractString...) =

base/pkg/entry.jl

@@ -176,7 +176,7 @@ function status(io::IO, pkg::AbstractString, ver::VersionNumber, fix::Bool)
         catch err
             print_with_color(Base.error_color(), io, " broken-repo (unregistered)")
         finally
-            finalize(prepo)
+            close(prepo)
         end
     else
         print_with_color(Base.warn_color(), io, "non-repo (unregistered)")
@@ -329,10 +329,10 @@ function pin(pkg::AbstractString, head::AbstractString)
                 # switch head to the branch
                 LibGit2.head!(repo, ref)
             finally
-                finalize(ref)
+                close(ref)
             end
         finally
-            finalize(commit)
+            close(commit)
         end
     end
     should_resolve && resolve()

base/pkg/read.jl

@@ -95,7 +95,7 @@ function isfixed(pkg::AbstractString, prepo::LibGit2.GitRepo, avail::Dict=availa
             end
         end
     finally
-        cache_has_head && LibGit2.finalize(crepo)
+        cache_has_head && LibGit2.close(crepo)
     end
     return res
 end
@@ -159,7 +159,7 @@ function installed_version(pkg::AbstractString, prepo::LibGit2.GitRepo, avail::D
             string(base) == head && push!(descendants,ver)
         end
     finally
-        cache_has_head && LibGit2.finalize(crepo)
+        cache_has_head && LibGit2.close(crepo)
     end
     both = sort!(intersect(ancestors,descendants))
     isempty(both) || warn("$pkg: some versions are both ancestors and descendants of head: $both")

base/pkg/write.jl

@@ -43,7 +43,7 @@ function install(pkg::AbstractString, sha1::AbstractString)
         fetch(repo, pkg, sha1)
         checkout(repo, pkg, sha1)
     finally
-        finalize(repo)
+        close(repo)
     end
 end
 

test/libgit2-online.jl

@@ -16,7 +16,7 @@ mktempdir() do dir
                 @test isdir(repo_path)
                 @test isdir(joinpath(repo_path, ".git"))
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 

test/libgit2.jl

@@ -43,7 +43,7 @@ end
         arr = convert(Vector{AbstractString}, sa1)
         @test arr[1] == p1
     finally
-        finalize(sa1)
+        close(sa1)
     end
 
     sa2 = LibGit2.StrArrayStruct(p1, p2)
@@ -55,17 +55,17 @@ end
         arr2 = convert(Vector{AbstractString}, sa3)
         @test arr1[1] == arr2[1]
         @test arr1[2] == arr2[2]
-        finalize(sa3)
+        close(sa3)
     finally
-        finalize(sa2)
+        close(sa2)
     end
 end
 
 @testset "Signature" begin
     sig = LibGit2.Signature("AAA", "AAA@BBB.COM", round(time(), 0), 0)
     git_sig = convert(LibGit2.GitSignature, sig)
     sig2 = LibGit2.Signature(git_sig)
-    finalize(git_sig)
+    close(git_sig)
     @test sig.name == sig2.name
     @test sig.email == sig2.email
     @test sig.time == sig2.time
@@ -159,7 +159,7 @@ mktempdir() do dir
             @test LibGit2.get(cfg, "tmp.int64", Int64(0)) == Int64(1)
             @test LibGit2.get(cfg, "tmp.bool", false) == true
         finally
-            finalize(cfg)
+            close(cfg)
         end
     end
 
@@ -172,7 +172,7 @@ mktempdir() do dir
 
                 # set a remote branch
                 branch = "upstream"
-                LibGit2.GitRemote(repo, branch, repo_url) |> finalize
+                LibGit2.GitRemote(repo, branch, repo_url) |> close
 
                 config = joinpath(cache_repo, ".git", "config")
                 lines = split(open(readstring, config, "r"), "\n")
@@ -181,9 +181,9 @@ mktempdir() do dir
                 remote = LibGit2.get(LibGit2.GitRemote, repo, branch)
                 @test LibGit2.url(remote) == repo_url
                 @test LibGit2.isattached(repo)
-                finalize(remote)
+                close(remote)
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 
@@ -195,7 +195,7 @@ mktempdir() do dir
                 @test isfile(joinpath(path, LibGit2.Consts.HEAD_FILE))
                 @test LibGit2.isattached(repo)
             finally
-                finalize(repo)
+                close(repo)
             end
 
             path = joinpath("garbagefakery", "Example.Bare")
@@ -220,7 +220,7 @@ mktempdir() do dir
                 @test LibGit2.isattached(repo)
                 @test LibGit2.remotes(repo) == ["origin"]
             finally
-                finalize(repo)
+                close(repo)
             end
         end
         @testset "bare with remote callback" begin
@@ -235,10 +235,10 @@ mktempdir() do dir
                     @test LibGit2.isattached(repo)
                     @test LibGit2.remotes(repo) == ["origin"]
                 finally
-                    finalize(rmt)
+                    close(rmt)
                 end
             finally
-                finalize(repo)
+                close(repo)
             end
         end
         @testset "normal" begin
@@ -248,7 +248,7 @@ mktempdir() do dir
                 @test isdir(joinpath(test_repo, ".git"))
                 @test LibGit2.isattached(repo)
             finally
-                finalize(repo)
+                close(repo)
             end
         end
     end
@@ -302,10 +302,10 @@ mktempdir() do dir
                     @test cmtr.email == test_sig.email
                     @test LibGit2.message(cmt) == commit_msg1
                 finally
-                    finalize(cmt)
+                    close(cmt)
                 end
             finally
-                finalize(repo)
+                close(repo)
                 close(repo_file)
             end
         end
@@ -333,17 +333,17 @@ mktempdir() do dir
                         @test LibGit2.shortname(tbref) == test_branch
                         @test LibGit2.upstream(tbref) === nothing
                     finally
-                        finalize(tbref)
+                        close(tbref)
                     end
                 finally
-                    finalize(brref)
+                    close(brref)
                 end
 
                 branches = map(b->LibGit2.shortname(b[1]), LibGit2.GitBranchIter(repo))
                 @test master_branch in branches
                 @test test_branch in branches
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 
@@ -365,7 +365,7 @@ mktempdir() do dir
                     @test sig.email == "BBBB@BBBB.COM"
                 end
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 
@@ -401,7 +401,7 @@ mktempdir() do dir
                 @test tag2 ∈ tags
                 @test tag1 ∉ tags
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 
@@ -425,7 +425,7 @@ mktempdir() do dir
                 @test status[1].status == LibGit2.Consts.STATUS_WT_NEW
                 close(repo_file)
             finally
-                finalize(repo)
+                close(repo)
             end
         end
     end
@@ -465,7 +465,7 @@ mktempdir() do dir
             LibGit2.branch!(repo, master_branch)
 
         finally
-            finalize(repo)
+            close(repo)
         end
     end
 
@@ -492,11 +492,11 @@ mktempdir() do dir
                 try
                     @test_throws LibGit2.Error.GitError LibGit2.upstream(tag2ref)
                 finally
-                    finalize(tag2ref)
+                    close(tag2ref)
                 end
 
             finally
-                finalize(repo)
+                close(repo)
             end
         end
 
@@ -519,8 +519,8 @@ mktempdir() do dir
                     @test cache_oids[i] == test_oids[i]
                 end
             finally
-                finalize(repo)
-                finalize(cache)
+                close(repo)
+                close(cache)
             end
         end
     end
@@ -582,7 +582,7 @@ mktempdir() do dir
                 @test read(io)[end] != 0x41
             end
         finally
-            finalize(repo)
+            close(repo)
         end
     end
 
@@ -626,7 +626,7 @@ mktempdir() do dir
             # issue #19624
             @test LibGit2.head_oid(repo) == newhead
         finally
-            finalize(repo)
+            close(repo)
         end
     end
 
@@ -647,7 +647,7 @@ mktempdir() do dir
             @test !isfile(joinpath(test_repo, "BBB"))
             @test isfile(joinpath(test_repo, test_file))
         finally
-            finalize(repo)
+            close(repo)
         end
     end
 
@@ -748,7 +748,7 @@ mktempdir() do dir
                                     println(f, err)
                                 end
                             finally
-                                finalize(repo)
+                                close(repo)
                             end
                             """
                             # We try to be helpful by desparately looking for