From: Thomas Rast Date: Mon, 14 Jun 2010 07:44:20 GMT Subject: Re: [PATCH v2 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Message-ID: <201006140944.20737.trast@student.ethz.ch> In-Reply-To: <7v7hm2e27z.fsf@alter.siamese.dyndns.org> Junio C Hamano wrote: > Thomas Rast writes: > > > +# If you would like to see the difference between HEAD and its upstream, > > +# set GIT_PS1_SHOWUPSTREAM to one of the following: > > +# git use @{upstream} > > +# svn attempt to DWIM svn upstream for normal and --stdlayout > > +# ref unconditionally use > > +# eval evaluate which should print the commit to use > > This looks somewhat overengineered, although "git" and "svn" are probably > useful in real life. I especially wonder if a fixed is useful at > all. Wouldn't the choice of "other" branch always depend on the current > branch? You're probably right. I had 'ref' early on to test around, and then made 'eval' to allow for arcane git-svn setups, but now that it seems Andrew has a nice way of matching those, we can also just drop it. -- Thomas Rast trast@{inf,student}.ethz.ch