Browse Source

Bugfix: Pass --update-head-ok to git fetch to avoid problems overwriting checked out branch

pull/33/head
Luke Dashjr 9 years ago
parent
commit
46b75df3d3
  1. 2
      bin/gbuild

2
bin/gbuild

@ -197,7 +197,7 @@ build_desc["remotes"].each do |remote| @@ -197,7 +197,7 @@ build_desc["remotes"].each do |remote|
unless File.exist?("inputs/#{dir}")
system!("git init inputs/#{dir}")
end
system!("cd inputs/#{dir} && git fetch #{sanitize_path(remote["url"], remote["url"])} +refs/tags/*:refs/tags/* +refs/heads/*:refs/heads/*")
system!("cd inputs/#{dir} && git fetch --update-head-ok #{sanitize_path(remote["url"], remote["url"])} +refs/tags/*:refs/tags/* +refs/heads/*:refs/heads/*")
commit = sanitize(remote["commit"], remote["commit"])
commit = `cd inputs/#{dir} && git log --format=%H -1 #{commit}`.strip
raise "error looking up commit for tag #{remote["commit"]}" unless $?.exitstatus == 0

Loading…
Cancel
Save