From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Rast Subject: Re: [PATCH v2 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Date: Mon, 14 Jun 2010 09:44:20 +0200 Message-ID: <201006140944.20737.trast@student.ethz.ch> References: <93842467ca22405712cab23a9b3920c106df0f17.1276336602.git.trast@student.ethz.ch> <7v7hm2e27z.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Andrew Sayers , "Shawn O. Pearce" , , John Tapsell , Steven Michalske , Michael J Gruber , "SZEDER =?iso-8859-1?q?G=E1bor?=" To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Jun 14 09:44:43 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OO4LZ-0006W3-M1 for gcvg-git-2@lo.gmane.org; Mon, 14 Jun 2010 09:44:41 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344Ab0FNHoh (ORCPT ); Mon, 14 Jun 2010 03:44:37 -0400 Received: from gwse.ethz.ch ([129.132.178.238]:12997 "EHLO gwse.ethz.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752851Ab0FNHog (ORCPT ); Mon, 14 Jun 2010 03:44:36 -0400 Received: from CAS02.d.ethz.ch (129.132.178.236) by gws01.d.ethz.ch (129.132.178.238) with Microsoft SMTP Server (TLS) id 8.2.254.0; Mon, 14 Jun 2010 09:44:35 +0200 Received: from thomas.localnet (213.55.131.184) by mail.ethz.ch (129.132.178.227) with Microsoft SMTP Server (TLS) id 8.2.254.0; Mon, 14 Jun 2010 09:44:27 +0200 User-Agent: KMail/1.13.3 (Linux/2.6.31.12-0.2-desktop; KDE/4.4.3; x86_64; ; ) In-Reply-To: <7v7hm2e27z.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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