diff options
author | Guido Guenther <agx@sigxcpu.org> | 2008-05-25 23:38:46 +0200 |
---|---|---|
committer | Guido Guenther <agx@sigxcpu.org> | 2008-05-25 23:38:46 +0200 |
commit | e6dd31e3cacb03a767d831c87f465b576425c101 (patch) | |
tree | c22c7acd22f59318a9381d21d12e41354d33ada5 | |
parent | b8f3238f3b65cf353433d2f94637c815ab6359ef (diff) | |
download | git-buildpackage-e6dd31e3cacb03a767d831c87f465b576425c101.tar.gz git-buildpackage-e6dd31e3cacb03a767d831c87f465b576425c101.tar.bz2 git-buildpackage-e6dd31e3cacb03a767d831c87f465b576425c101.zip |
Help pristine-tar to find the branch name
Closes: #481806
-rwxr-xr-x | git-import-dsc | 2 | ||||
-rwxr-xr-x | git-import-orig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-import-dsc b/git-import-dsc index c8e34a5d..aece7f9c 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -47,7 +47,7 @@ def import_initial(src, dirs, options): gbpc.GitBranch()(options.upstream_branch) if options.pristine_tar: gbpc.PristineTar().commit(os.path.join(dirs['top'], src.tgz), - options.upstream_branch) + 'refs/heads/%s' % options.upstream_branch) except gbpc.CommandExecFailed: print >>sys.stderr, "Creation of git repository failed" return False diff --git a/git-import-orig b/git-import-orig index 17744f28..e540880d 100755 --- a/git-import-orig +++ b/git-import-orig @@ -203,7 +203,7 @@ on howto create it otherwise use --upstream-branch to specify it. if options.pristine_tar: upstream_branch = [ options.upstream_branch, 'master' ][is_empty] if pristine_orig: - gbpc.PristineTar().commit(pristine_orig, upstream_branch) + gbpc.PristineTar().commit(pristine_orig, 'refs/heads/%s' % upstream_branch) else: print >>sys.stderr, "Warning: '%s' not an archive, skipping pristine-tar" % archive gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version), |