From 9c95b90ca3fccd6c791f20de856c162df973fa1c Mon Sep 17 00:00:00 2001 From: devrandom Date: Fri, 3 Aug 2012 15:02:11 -0700 Subject: [PATCH] Fix git-fetch and brctl doc --- README.md | 2 +- bin/gbuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c2af490..b1dfa9d 100644 --- a/README.md +++ b/README.md @@ -79,5 +79,5 @@ If you have a runaway `lxc-start` command, just use `kill -9` on it. The machine configuration requires access to br0 and assumes that the host address is 10.0.2.2: - sudo brctl add br0 + sudo brctl addbr br0 sudo ifconfig br0 10.0.2.2/24 up diff --git a/bin/gbuild b/bin/gbuild index 201f520..f08155a 100755 --- a/bin/gbuild +++ b/bin/gbuild @@ -193,7 +193,7 @@ build_desc["remotes"].each do |remote| system!("git init inputs/#{dir}") system!("cd inputs/#{dir} && git remote add origin #{sanitize_path(remote["url"], remote["url"])}") end - system!("cd inputs/#{dir} && git fetch --tags") + system!("cd inputs/#{dir} && git fetch && git fetch --tags") commit = sanitize(remote["commit"], remote["commit"]) commit = `cd inputs/#{dir} && git log --format=%H -1 #{commit}`.strip system!("cd inputs/#{dir} && git checkout -q #{commit}")