summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-02-06 20:54:07 +0200
committerLars Wirzenius <liw@liw.fi>2016-02-06 20:55:43 +0200
commit15cf165c4fc04c196f1f9dd81562fd3aab1b5256 (patch)
tree90b39d7b634c559c272865d1e63eb24520d84b30
parent8349841eb65e81bc7d0b09f33fce86fb4f613604 (diff)
downloadobnam-benchmarks-15cf165c4fc04c196f1f9dd81562fd3aab1b5256.tar.gz
When cloning git repo, checkout master
This makes test suite pass again, when the (real!) obnam git repo I have locally doesn't have master checked out.
-rw-r--r--NEWS6
-rwxr-xr-xobbench4
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cba39cf..45c57a9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
NEWS file for obbench
=====================
+Version 0.9, released UNRELEASED
+--------------------------------
+
+* Fix clone of git repo to check out master, to fix test suite when
+ the Obnam git repo doesn't have master checked out.
+
Version 0.8, released 2016-02-06
--------------------------------
diff --git a/obbench b/obbench
index 13c875a..f719cad 100755
--- a/obbench
+++ b/obbench
@@ -57,7 +57,9 @@ class ObnamBenchmarker(cliapp.Application):
if os.path.exists(gitdir):
cliapp.runcmd(['git', 'pull'], cwd=gitdir)
else:
- cliapp.runcmd(['git', 'clone', spec['git'], gitdir])
+ cliapp.runcmd(
+ ['git', 'clone', '-b', 'master', spec['git'],
+ gitdir])
def gitdir(self, statedir):
return os.path.join(statedir, 'git')