Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-26 Thread Simon Oosthoek
* Junio C Hamano [2012-12-25 23:47:53 -0800]: > Can we make it take an optional third parameter so that we could say > > PROMPT_COMMAND='__git_ps1 ": \h \W" "; " "/%s"' > > to do the same as what the command substitution mode would have > given for > > PS1=': \h \W$(__git_ps1 "/%s

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-25 Thread Junio C Hamano
Simon Oosthoek writes: > On 12/12/12 18:50, Junio C Hamano wrote: >> Simon Oosthoek writes: >> >>> This removes most of the ambiguities :-) >>> Ack from me! >> >> OK, as this is a low-impact finishing touch for a new feature, I'll >> fast-track this to 'master' before the final release. >> >

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-12 Thread Simon Oosthoek
On 12/12/12 18:50, Junio C Hamano wrote: > Simon Oosthoek writes: > >> This removes most of the ambiguities :-) >> Ack from me! > > OK, as this is a low-impact finishing touch for a new feature, I'll > fast-track this to 'master' before the final release. > Ok, wonderful! BTW, I tried the thin

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-12 Thread Junio C Hamano
Simon Oosthoek writes: > This removes most of the ambiguities :-) > Ack from me! OK, as this is a low-impact finishing touch for a new feature, I'll fast-track this to 'master' before the final release. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a m

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-12 Thread Simon Oosthoek
Hi Junio This removes most of the ambiguities :-) Ack from me! I still have some minor nits, but I'll leave that for another time when I'm less busy. BTW, I haven't tried this yet, but if you pass 2 arguments to __git_ps1 when called from command-substition mode, I suppose it will think it's i

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-11 Thread Junio C Hamano
Junio C Hamano writes: > Perhaps like this? OK, this time with a log message. -- >8 -- Subject: [PATCH] git-prompt.sh: update PROMPT_COMMAND documentation The description of __git_ps1 function operating in two-arg mode was not very clear. It said "set PROMPT_COMMAND=__git_ps1" which is not th

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-11 Thread Junio C Hamano
Simon Oosthoek writes: > This patch for the documentation doesn't seem to be in rc2 of 1.8.1... There wasn't any patch, and after sending "something like this" I forgot about the topic, as usual. > The current tagged 1.8.1-rc2 doesn't yet have your improvement and after > trying to explain it,

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-12-11 Thread Simon Oosthoek
Hi Junio This patch for the documentation doesn't seem to be in rc2 of 1.8.1... tonight I was explaining this feature to a small group of people and I pulled the git tree to get the latest code. The current tagged 1.8.1-rc2 doesn't yet have your improvement and after trying to explain it, I thin

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
On 28/11/12 21:47, Junio C Hamano wrote: > Simon Oosthoek writes: > >> perhaps the point should read like this: >> #3a) In ~/.bashrc set PROMPT_COMMAND >> #To customize the prompt, provide start/end arguments >> #PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "' >> >> Which would

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Junio C Hamano
Simon Oosthoek writes: > perhaps the point should read like this: > #3a) In ~/.bashrc set PROMPT_COMMAND > #To customize the prompt, provide start/end arguments > #PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "' > > Which would not be confusing at all, I think... It says "to cu

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
On 28/11/12 19:02, Piotr Krukowiecki wrote: > Is your setting?: > PROMPT_COMMAND=__git_ps1 > > > That's right > > > I believe you need to give 2 parameters in order to use it in > PROMPT_COMMAND mode. > > > Are you sure? git-prompt.sh says: > > #3a) In ~/.bashrc set PROM

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Piotr Krukowiecki
Re-sending mail. On Wed, Nov 28, 2012 at 7:02 PM, Piotr Krukowiecki wrote: > > On Wed, Nov 28, 2012 at 2:20 PM, Simon Oosthoek wrote: >> >> * Piotr Krukowiecki [2012-11-28 11:03:29 >> +0100]: >> >> > Hi, >> > >> > when I set PROMPT_COMMAND to __git_ps1 I get a space at the beginning: >> > >> >

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
* Piotr Krukowiecki [2012-11-28 11:03:29 +0100]: > Hi, > > when I set PROMPT_COMMAND to __git_ps1 I get a space at the beginning: > Is your setting?: PROMPT_COMMAND=__git_ps1 I believe you need to give 2 parameters in order to use it in PROMPT_COMMAND mode. In my .bashrc I have: if [ -f ~/.