diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-23 14:03:52 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-23 14:03:52 +0000 |
commit | 04b408faab3e230f695e19bac4bc3b92ab252104 (patch) | |
tree | cf43adfdc1c4d41aad278dd23a8f9addf1c8f34e /lorry | |
parent | 9afd697cefc0c6250e31b67e1558abea2a2fbd20 (diff) | |
parent | 814feeb2cd7597bf456cae418a3691f48ddb5a47 (diff) | |
download | lorry-04b408faab3e230f695e19bac4bc3b92ab252104.tar.gz |
Merge remote branch 'origin/master'
Diffstat (limited to 'lorry')
-rwxr-xr-x | lorry | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -114,9 +114,23 @@ class Lorry(cliapp.Application): quote_url(bundlename)) + '.bndl' if not os.path.exists(path) or self.settings['bundle'] == 'always': self.progress('.. building bundle %s' % bundlename) + + # create the bundle self.run_program(['git', 'bundle', 'create', path, '--branches', '--tags'], cwd=gitdir) + # FIXME this is a hack to avoid unrecognized headers in bundles, + # which happens with some repositories. See + # + # http://marc.info/?l=git&m=132992959317420&w=2 + # + # for more information. From the bundle's header section, the + # expression below will remove all garbage lines that appear + # between the first line (the bundle format meta comment) and + # the list of refs. + expr = '1,/^[0-9a-f]\{40\}/{ /^[0-9a-f]\{40\}/!{/^[^#]/d}}' + self.run_program(['sed', '-i', '-e', expr, path], cwd=gitdir) + def gitify(self, name, spec): self.progress('Getting %s' % name) table = { |