summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Christian Hammerl <info@christian-hammerl.de>2012-02-20 13:17:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-21 12:38:07 -0800
commitf24a595f72e52b3519067cfb0f05652aabf1e144 (patch)
treee005ae4d1d364f0407c7f9b407636e913f02e674
parentUpdate draft release notes to 1.7.9.2 (diff)
downloadtgif-f24a595f72e52b3519067cfb0f05652aabf1e144.tar.xz
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 <info@christian-hammerl.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 91c7acbbb4..61ff1521b6 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
}