Package: pristine-tar
Version: 0.5
Severity: minor

I'm wondering whether assuming that the user wants to “pristine-tar
commit” against the local upstream branch would be nice. Here is an
example:

---------- o< o< o< ----------
$ git-clone git://alioth.debian.org/~kibi-guest/pristine-tar-debug.git
# …
$ cd pristine-tar-debug
$ git-branch pristine-tar origin/pristine-tar
$ pristine-tar commit ../graphviz_2.16.orig.tar.gz
pristine-tar: more than one ref matches "upstream":
5d23788286712f7ceda4e46f66d8c60272c1f388 refs/heads/upstream
5d23788286712f7ceda4e46f66d8c60272c1f388 refs/remotes/origin/upstream
---------- >o >o >o ----------

BTW, it's possible to specify “origin/upstream” as second parameter, but
explicitely specifying “upstream”, which is the default, won't help. One
has to figure that git-show-ref is used, and that e.g. “heads/upstream”
should be used.

Maybe something like the following might do: keep the above message, and
then prompt the user with:
    Assume local upstream branch? [Y/n]
or:
    Assume local (refs/heads/upstream) upstream branch? [Y/n]

and if 'n' is pressed, tell the user to either use a (more) complete
branch name, a tag, or a treeish?

Cheers,

-- 
Cyril Brulebois



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to