Fix invalidations from Pair(obj) methods (#2695)

xref sbromberger/LightGraphs.jl#1581

Author: timholy

src/API.jl

@@ -1491,19 +1491,21 @@ function instantiate(ctx::Context; manifest::Union{Bool, Nothing}=nothing,
             pkgerror("Did not find path `$(repo_source)` for $(err_rep(pkg))")
         end
         repo_path = Types.add_repo_cache_path(repo_source)
-        LibGit2.with(GitTools.ensure_clone(ctx.io, repo_path, repo_source; isbare=true)) do repo
-            # We only update the clone if the tree hash can't be found
-            tree_hash_object = tree_hash(repo, string(pkg.tree_hash))
-            if tree_hash_object === nothing
-                GitTools.fetch(ctx.io, repo, repo_source; refspecs=Types.refspecs)
+        let repo_source=repo_source
+            LibGit2.with(GitTools.ensure_clone(ctx.io, repo_path, repo_source; isbare=true)) do repo
+                # We only update the clone if the tree hash can't be found
                 tree_hash_object = tree_hash(repo, string(pkg.tree_hash))
+                if tree_hash_object === nothing
+                    GitTools.fetch(ctx.io, repo, repo_source; refspecs=Types.refspecs)
+                    tree_hash_object = tree_hash(repo, string(pkg.tree_hash))
+                end
+                if tree_hash_object === nothing
+                    pkgerror("Did not find tree_hash $(pkg.tree_hash) for $(err_rep(pkg))")
+                end
+                mkpath(sourcepath)
+                GitTools.checkout_tree_to_path(repo, tree_hash_object, sourcepath)
+                push!(new_git, pkg.uuid)
             end
-            if tree_hash_object === nothing
-                 pkgerror("Did not find tree_hash $(pkg.tree_hash) for $(err_rep(pkg))")
-            end
-            mkpath(sourcepath)
-            GitTools.checkout_tree_to_path(repo, tree_hash_object, sourcepath)
-            push!(new_git, pkg.uuid)
         end
     end
 

src/GitTools.jl

@@ -158,8 +158,10 @@ function fetch(io::IO, repo::LibGit2.GitRepo, remoteurl=nothing; header=nothing,
     end
     try
         if use_cli_git()
-            cd(LibGit2.path(repo)) do
-                run(`git fetch -q $remoteurl $(only(refspecs))`)
+            let remoteurl=remoteurl
+                cd(LibGit2.path(repo)) do
+                    run(`git fetch -q $remoteurl $(only(refspecs))`)
+                end
             end
         else
             return LibGit2.fetch(repo; remoteurl=remoteurl, callbacks=callbacks, refspecs=refspecs, kwargs...)

src/Types.jl

@@ -705,7 +705,9 @@ function handle_repo_add!(ctx::Context, pkg::PackageSpec)
     end
 
     let repo_source = repo_source
-        LibGit2.with(GitTools.ensure_clone(ctx.io, add_repo_cache_path(repo_source), repo_source; isbare=true)) do repo
+        # The type-assertions below are necessary presumably due to julia#36454
+        LibGit2.with(GitTools.ensure_clone(ctx.io, add_repo_cache_path(repo_source::Union{Nothing,String}), repo_source::Union{Nothing,String}; isbare=true)) do repo
+            repo_source_typed = repo_source::Union{Nothing,String}
             GitTools.check_valid_HEAD(repo)
 
             # If the user didn't specify rev, assume they want the default (master) branch if on a branch, otherwise the current commit
@@ -717,7 +719,7 @@ function handle_repo_add!(ctx::Context, pkg::PackageSpec)
             fetched = false
             if obj_branch === nothing
                 fetched = true
-                GitTools.fetch(ctx.io, repo, repo_source; refspecs=refspecs)
+                GitTools.fetch(ctx.io, repo, repo_source_typed; refspecs=refspecs)
                 obj_branch = get_object_or_branch(repo, pkg.repo.rev)
                 if obj_branch === nothing
                     pkgerror("Did not find rev $(pkg.repo.rev) in repository")
@@ -729,7 +731,7 @@ function handle_repo_add!(ctx::Context, pkg::PackageSpec)
             innerentry = manifest_info(ctx.env.manifest, pkg.uuid)
             ispinned = innerentry !== nothing && innerentry.pinned
             if isbranch && !fetched && !ispinned
-                GitTools.fetch(ctx.io, repo, repo_source; refspecs=refspecs)
+                GitTools.fetch(ctx.io, repo, repo_source_typed; refspecs=refspecs)
                 gitobject, isbranch = get_object_or_branch(repo, pkg.repo.rev)
             end