summaryrefslogtreecommitdiff
path: root/lorry
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:21:51 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:21:51 +0100
commita094e3202700cc4baf4b4d4fb2ed9a580ac8f6cc (patch)
treee12eaa852453b663e9b94b9a5589fc8b2ff1f4e3 /lorry
parent64546867e445b52a5554ccf1c7e507eeb2ddf4d4 (diff)
downloadlorry-a094e3202700cc4baf4b4d4fb2ed9a580ac8f6cc.tar.gz
lorry: don't assume the cached remote is correct
The origin remote may not be the remote that should be pulled from any more, it may have been changed in the .lorry. Also since we are pushing refs/heads/*, we should be fetching the same.
Diffstat (limited to 'lorry')
-rwxr-xr-xlorry4
1 files changed, 3 insertions, 1 deletions
diff --git a/lorry b/lorry
index 7c43691..b91522b 100755
--- a/lorry
+++ b/lorry
@@ -240,7 +240,9 @@ class Lorry(cliapp.Application):
self.run_program(['git', 'clone', '--mirror', spec['url'], gitdir])
else:
self.progress('.. updating existing clone')
- self.run_program(['git', 'fetch', 'origin'], cwd=gitdir)
+ self.run_program(['git', 'fetch', spec['url'],
+ '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')