[PATCH] git-prompt.sh: show the upstream abbrev name

2013-10-10 Thread Julien Carsique
From: Julien Carsique When working with multiple remotes, it is common to switch the upstream from a remote to another. Doing so, the prompt may not be the expected one. Providing an option to display tracking information sounds useful. Add a "name" option to GIT_PS1_SHOWUPSTREAM which will show

[PATCH] git-prompt.sh: show the upstream abbrev name

2013-10-10 Thread Julien Carsique
From: Julien Carsique When working with multiple remotes, it is common to switch the upstream from a remote to another. Doing so, the prompt may not be the expected one. Providing an option to display tracking information sounds useful. Add a "name" option to GIT_PS1_SHOWUPSTREAM which will show

Re: [PATCH] git-prompt.sh: show the upstream abbrev name

2013-10-10 Thread SZEDER Gábor
Hi, On Thu, Oct 10, 2013 at 03:32:13PM +0200, Julien Carsique wrote: > @@ -204,6 +206,9 @@ __git_ps1_show_upstream () > *) # diverged from upstream > p=" u+${count#* }-${count% *}" ;; > esac > + if [[ -n "$count" && -n "$n

Re: [PATCH] git-prompt.sh: show the upstream abbrev name

2013-10-10 Thread Julien Carsique
On 10/10/2013 15:58, SZEDER Gábor wrote: > Hi, > > On Thu, Oct 10, 2013 at 03:32:13PM +0200, Julien Carsique wrote: >> @@ -204,6 +206,9 @@ __git_ps1_show_upstream () >> *) # diverged from upstream >> p=" u+${count#* }-${count% *}" ;; >> e

Re: [PATCH] git-prompt.sh: show the upstream abbrev name

2013-10-15 Thread SZEDER Gábor
On Thu, Oct 10, 2013 at 04:43:22PM +0200, Julien Carsique wrote: > It's fixed. Thanks, the updated patch looks good to me. > Note '+=' was already used line 114: > > svn_url_pattern+="\\|$value" I guess noone has tried to use the upstream status indicator with an SVN upstream and an