Re: [PATCH] completion: Allow dash as the first character for __git_ps1
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 21, 2012, 20:40 UTC
- Message-ID
- <7vty2jgbsh.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1329740273-5580-1-git-send-email-info@christian-hammerl.de>
Christian Hammerl <info@christian-hammerl.de> writes:
Show 24 quoted lines
> If the argument for `__git_ps1` begins with a dash, `printf` tries to
> interpret it as an option which results in an error message.
> The problem is solved by adding '--' before the argument to tell
> `printf` to not interpret the following argument as an option.
> Adding '--' directly to the argument does not help because the argument
> is enclosed by double quotes.
>
> Signed-off-by: Christian Hammerl <info@christian-hammerl.de>
> ---
> contrib/completion/git-completion.bash | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 91c7acb..61ff152 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -313,7 +313,7 @@ __git_ps1 ()
> fi
>
> local f="$w$i$s$u"
> - printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
> + printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
> fi
> }Hmm, so you may be doing something like PS1='\W$(__git_ps1 "-%s")'? OK, and thanks.