From: Christian Hammerl Date: Mon, 20 Feb 2012 12:17:53 +0000 (+0100) Subject: completion: Allow dash as the first character for __git_ps1 X-Git-Tag: v1.7.9.2~17 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f24a595f72e52b3519067cfb0f05652aabf1e144;hp=233054d114b0d68cf58d18f4c7ddd7723c08b24f;p=git.git completion: Allow dash as the first character for __git_ps1 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 91c7acbbb..61ff1521b 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 }