diff options
Diffstat (limited to 'lorry')
-rwxr-xr-x | lorry | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -681,11 +681,18 @@ class Lorry(cliapp.Application): self.needs_aggressive = True env = dict(os.environ) env['CVS_RSH'] = 'lorry-ssh-wrapper' + env['GIT_DIR'] = gitdir self.run_program( - ['git', 'cvsimport', '-a', '-d', spec['url'], - '-C', gitdir, spec['module']], + ['git', 'cvsimport', '-a', '-d', spec['url'], + '-i', spec['module']], env=env) + # git cvsimport may create an index even in a bare repo + try: + os.remove(os.path.join(gitdir, 'index')) + except FileNotFoundError: + pass + def gitify_hg(self, project_name, dirname, gitdir, spec): cert_options = [] if not self.should_check_certificates(spec): |