From 37e831026c93e346bf18a913008b02f72808e666 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Guido=20G=C3=BCnther?= Date: Sun, 30 Oct 2011 13:51:22 +0100 Subject: [PATCH] Allow to import upstream tarballs into bare repositories Closes: #582775 --- git-import-orig | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/git-import-orig b/git-import-orig index 0c11371..263d0ba 100755 --- a/git-import-orig +++ b/git-import-orig @@ -253,6 +253,16 @@ def repack_source(source, name, version, tmpdir, filters): return (repacked, tmpdir) +def set_bare_repo_options(options): + """Modify options for import into a bare repository""" + if options.pristine_tar or options.merge: + gbp.log.info("Bare repository: setting %s%s options" + % (["", " '--no-pristine-tar'"][options.pristine_tar], + ["", " '--no-merge'"][options.merge])) + options.pristine_tar = False + options.merge = False + + def parse_args(argv): try: parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='', @@ -348,6 +358,9 @@ def main(argv): gbp.log.err("Repository has uncommitted changes, commit these first: ") raise GbpError, out + if repo.bare: + set_bare_repo_options(options) + if not source.is_dir: tmpdir = tempfile.mkdtemp(dir='../') source.unpack(tmpdir, options.filters) -- 2.7.4