give refspecs to the registry (#258)

JuliaLang · Apr 26, 2018 · 026bd86 · 026bd86
1 parent 67fc4fc
commit 026bd86
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/stdlib/Pkg3/src/API.jl b/stdlib/Pkg3/src/API.jl
@@ -82,7 +82,7 @@ function update_registry(ctx)
  end
  branch = LibGit2.headname(repo)
  try
- GitTools.fetch(repo)
+ GitTools.fetch(repo; refspecs=["+refs/heads/$branch:refs/remotes/origin/$branch"])
  catch e
  e isa LibGit2.GitError || rethrow(e)
  push!(errors, (reg, "failed to fetch from repo"))

diff --git a/stdlib/Pkg3/src/GitTools.jl b/stdlib/Pkg3/src/GitTools.jl
@@ -36,7 +36,6 @@ function showprogress(io::IO, p::MiniProgressBar)
 end
 
 function transfer_progress(progress::Ptr{LibGit2.TransferProgress}, p::Any)
-
  progress = unsafe_load(progress)
  @assert haskey(p, :transfer_progress)
  bar = p[:transfer_progress]

diff --git a/stdlib/Pkg3/src/Types.jl b/stdlib/Pkg3/src/Types.jl
@@ -719,7 +719,12 @@ function handle_repos_add!(ctx::Context, pkgs::AbstractVector{PackageSpec}; upgr
  pinned = (info != nothing && get(info, "pinned", false))
  if upgrade_or_add && !pinned && !just_cloned
  rev = pkg.repo.rev
- GitTools.fetch(repo, pkg.repo.url; refspecs=refspecs, credentials=creds)
+ try
+ GitTools.fetch(repo, pkg.repo.url; refspecs=refspecs, credentials=creds)
+ catch e
+ e isa LibGit2.GitError || rethrow(e)
+ cmderror("failed to fetch from $(pkg.repo.url), error: $e")
+ end
  end
  if upgrade_or_add && !pinned
  rev = pkg.repo.rev