On Sunday 18 May 2008 5:39:08 pm Joey Hess wrote: > Andres Mejia wrote: > > pristine-tar fails for me with the following message. > > > > pristine-tar: more than one ref matches "upstream": > > 5f4736c83ea06e9b479a35f25d997b73713306b9 refs/heads/upstream > > a8c20d823bc28bb8f6d127e301390bed06e49169 refs/remotes/origin/upstream > > /usr/bin/pristine-tar returned 255 > > Couldn't run '/usr/bin/pristine-tar' > > If you were running pristine-tar commit at the command line, you could > disambiguate which ref to use by passing the ref name after the tarball. > But you're using it from git-import-orig, so you can't. Hmm. > > > This happened when I tried using the --pristine-tar option in > > git-import-orig. I do track the remote 'upstream' branch, so that > > git-import-orig will not complain about a missing 'upstream' branch. > > Hmm, I think I'm missing something. How does git-import-orig know which > upstream branch to use? > > If you're passing it the --upstream-branch= option, perhaps what it > needs to do it pass that on to pristine-tar. Or is there some way it can > work out which branch to used based on your repo setup?
git-import-orig does use what's supplied by the --upstream-branch option or what is found in the gbp.conf files and that is what is passed on to pristine-tar. I suppose this is a problem with git-buildpackage. I've already cloned this bug and assigned it to git-buildpackage. http://bugs.debian.org/481806 -- Regards, Andres
signature.asc
Description: This is a digitally signed message part.
