From 209369d6b7ae126653c44551529c418814378fb7 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 11 Apr 2008 19:17:26 +0200 Subject: don't pass nonexisting branches to pristine-tar in case of an empty archive the upstream branch does not yet exist, so pass 'master' to pristine-tar instead Closes: #475554 --- git-import-orig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-import-orig b/git-import-orig index 0d0d3a65..ad558549 100755 --- a/git-import-orig +++ b/git-import-orig @@ -175,7 +175,8 @@ on howto create it otherwise use --upstream-branch to specify it. import_upstream_tree(repo, orig_dir, version, options.filters, verbose=not is_empty) if options.pristine_tar: - gbpc.PristineTar().commit(archive, options.upstream_branch) + upstream_branch = [ options.upstream_branch, 'master' ][is_empty] + gbpc.PristineTar().commit(archive, upstream_branch) gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version), msg="Upstream version %s" % version) -- cgit v1.2.3