Hi Andres,
On Mon, May 19, 2008 at 03:14:58AM -0400, Andres Mejia wrote:
> On Monday 19 May 2008 3:08:32 am Guido Günther wrote:
> > On Mon, May 19, 2008 at 02:38:50AM -0400, Andres Mejia wrote:
> > > I think it would be better if it called the tag object instead of the
> > > upstream branch name, since in the latter case, it will always fail since
> > > it's finding a local upstream branch (refs/heads/upstream) and a remote
> > > upstream branch (refs/remotes/origin/upstream).
> >
> > Since the branch passed to git-import-orig needs to be a local branch
> > anyway we can simply prefix with 'refs/heads' to make pristine-tar
> > happy.
> > -- Guido
>
> That should work too.
Could you check if this patch helps:
diff --git a/git-import-dsc b/git-import-dsc
index c8e34a5..aece7f9 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 17744f2..e540880 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),
Cheers,
-- Guido
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
