Merge #976

976: Backports for 1.1.2 r=fredrikekre a=fredrikekre bors try Co-authored-by: David Varela <[email protected]> Co-authored-by: Fredrik Ekre <[email protected]>
JuliaLang · Dec 26, 2018 · 853b3f1 · 853b3f1
2 parents cfbe047 + 529b896
commit 853b3f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ desc = "The next-generation Julia package manager."
 keywords = ["package", "management"]
 license = "MIT"
 name = "Pkg"
-version = "1.1.1"
+version = "1.1.2"
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [deps]

diff --git a/src/API.jl b/src/API.jl
@@ -239,9 +239,9 @@ function gc(ctx::Context=Context(); kwargs...)
         manifest == nothing && continue
         new_usage[manifestfile] = [Dict("time" => date)]
         for (uuid, entry) in manifest
-            if entry.git_tree_sha !== nothing
+            if entry.repo.tree_sha !== nothing
                 push!(paths_to_keep,
-                      Operations.find_installed(entry.name, uuid, entry.git_tree_sha))
+                      Operations.find_installed(entry.name, uuid, entry.repo.tree_sha))
             end
         end
     end

diff --git a/test/pkg.jl b/test/pkg.jl
@@ -602,6 +602,16 @@ end
     end
 end
 
+#issue #975
+@testset "Pkg.gc" begin
+    temp_pkg_dir() do project_path
+        with_temp_env() do
+            Pkg.add("Example")
+            Pkg.gc()
+        end
+    end
+end
+
 include("repl.jl")
 include("api.jl")
 include("registry.jl")