summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Cody A Taylor <codemister99@yahoo.com>2015-03-12 19:24:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-15 14:23:22 -0700
commit9bdc5173f0bc514d0b76165d45729622b2ad4d89 (patch)
treeda1c268253553011c696fe35e25a35a0fca5a13f /contrib
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-9bdc5173f0bc514d0b76165d45729622b2ad4d89.tar.xz
git prompt: use toplevel to find untracked files
The __git_ps1() prompt function would not show an untracked state when all the untracked files are outside the current working directory. Signed-off-by: Cody A Taylor <codemister99@yahoo.com> Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-prompt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 9d684b10a6..10c4d0ad74 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -474,7 +474,7 @@ __git_ps1 ()
if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
[ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
- git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
+ git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null
then
u="%${ZSH_VERSION+%}"
fi