From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Simon Oosthoek <s.oosthoek@xs4all.nl>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format
Date: Wed, 28 Nov 2012 19:04:40 +0100 [thread overview]
Message-ID: <CAA01CsouyXABkmbFy_u3Qt8R8W+1caxn34d5pscZSZJk9mynQg@mail.gmail.com> (raw)
In-Reply-To: <CAA01CspHAHN7se2oJ2WgcmpuRfoa+9Sx9sUvaPEmQ-Y+kDwHhA@mail.gmail.com>
Re-sending mail.
On Wed, Nov 28, 2012 at 7:02 PM, Piotr Krukowiecki
<piotr.krukowiecki@gmail.com> wrote:
>
> On Wed, Nov 28, 2012 at 2:20 PM, Simon Oosthoek <s.oosthoek@xs4all.nl> wrote:
>>
>> * Piotr Krukowiecki <piotr.krukowiecki@gmail.com> [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
>
>
> 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 PROMPT_COMMAND=__git_ps1
> # To customize the prompt, provide start/end arguments
> # PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
>
> I interpret this as: if you don't want to customize the prompt, the simple "PROMPT_COMMAND=__git_ps1" is enough.
>
>>
>> > (master)pkruk@foobar ~/dir$
>> > ^ space
>> >
>> > Is there a reason for this? It looks like a waste of space. If I'm not in
>> > git repository I don't have the space:
>> >
>> > pkruk@foobar ~/other$
>> >
>> > I noticed the space is explicitly specified in printf_format in
>> > git-prompt.sh. Is it needed? If I remove it, everything seems to work fine
>> > (no leading space)...
>> >
>> > --- /usr/local/src/git/git/contrib/completion/git-prompt.sh 2012-11-28
>> > 10:27:05.728939201 +0100
>> > +++ /home/pkruk/.git-prompt.sh 2012-11-28 10:52:56.852629745 +0100
>> > @@ -218,7 +218,7 @@ __git_ps1 ()
>> > local detached=no
>> > local ps1pc_start='\u@\h:\w '
>> > local ps1pc_end='\$ '
>> > - local printf_format=' (%s)'
>> > + local printf_format='(%s)'
>> >
>> > case "$#" in
>> > 2) pcmode=yes
>>
>>
>> These last 2 lines say: if 2 arguments are given, use pcmode. Otherwise you get command-subtitution mode, which gives weird effects when being called from PROMPT_COMMAND.
>>
>
> Still, it seems to work with above "patch"..
>
--
Piotr Krukowiecki
next prev parent reply other threads:[~2012-11-28 18:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAA01Cso1E4EC4W667FEU_af2=uGOfPuaWEB3y+zPCpB+bPzoaA@mail.gmail.com>
2012-11-28 13:20 ` git-prompt.sh vs leading white space in __git_ps1()::printf_format Simon Oosthoek
[not found] ` <CAA01CspHAHN7se2oJ2WgcmpuRfoa+9Sx9sUvaPEmQ-Y+kDwHhA@mail.gmail.com>
2012-11-28 18:04 ` Piotr Krukowiecki [this message]
2012-11-28 20:08 ` Simon Oosthoek
2012-11-28 20:47 ` Junio C Hamano
2012-11-28 20:58 ` Simon Oosthoek
2012-12-11 22:47 ` Simon Oosthoek
2012-12-11 23:04 ` Junio C Hamano
2012-12-12 0:03 ` Junio C Hamano
2012-12-12 8:55 ` Simon Oosthoek
2012-12-12 17:50 ` Junio C Hamano
2012-12-12 20:25 ` Simon Oosthoek
2012-12-26 7:47 ` Junio C Hamano
2012-12-26 12:51 ` Simon Oosthoek
2012-12-26 19:15 ` [PATCH] make __git_ps1 accept a third parameter in pcmode Simon Oosthoek
2012-12-26 19:45 ` Junio C Hamano
2012-12-26 20:19 ` Simon Oosthoek
2012-12-26 20:32 ` Junio C Hamano
2012-12-26 20:54 ` Junio C Hamano
2012-12-26 21:03 ` Simon Oosthoek
2012-12-26 20:42 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAA01CsouyXABkmbFy_u3Qt8R8W+1caxn34d5pscZSZJk9mynQg@mail.gmail.com \
--to=piotr.krukowiecki@gmail.com \
--cc=git@vger.kernel.org \
--cc=s.oosthoek@xs4all.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).