summaryrefslogtreecommitdiff
path: root/lorry
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:42:16 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:42:16 +0100
commit6cbd43fd64d1ab98a3884dc416342962c74e2544 (patch)
treefdea8f4f8570a17da5ee112eae46dd3cd74976fb /lorry
parent1aa5c24c3661c2064b626419ded16ac38e66cf32 (diff)
downloadlorry-6cbd43fd64d1ab98a3884dc416342962c74e2544.tar.gz
lorry: force fetch from upstream
As annoying as it is to have non-fast-forward commits, it is still a valid workflow, so it has to be allowed.
Diffstat (limited to 'lorry')
-rwxr-xr-xlorry4
1 files changed, 2 insertions, 2 deletions
diff --git a/lorry b/lorry
index b91522b..b85ad91 100755
--- a/lorry
+++ b/lorry
@@ -241,8 +241,8 @@ class Lorry(cliapp.Application):
else:
self.progress('.. updating existing clone')
self.run_program(['git', 'fetch', spec['url'],
- 'refs/heads/*:refs/heads/*',
- 'refs/tags/*:refs/tags/*'], cwd=gitdir)
+ '+refs/heads/*:refs/heads/*',
+ '+refs/tags/*:refs/tags/*'], cwd=gitdir)
def gitify_bzr(self, project_name, dirname, gitdir, spec):
bzrdir = os.path.join(dirname, 'bzr')