aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-28 09:33:12 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-28 09:33:12 -0700
commit245dd15aa9e086d82de7a9c947aa916e6d702f48 (patch)
treebee5875fb5f87b22c493440869b36fbc1eabf013 /contrib
parentb70cec0a2e8636c12617b38255c7ad2bb90f5cc9 (diff)
parent9bdc5173f0bc514d0b76165d45729622b2ad4d89 (diff)
downloadgit-245dd15aa9e086d82de7a9c947aa916e6d702f48.tar.gz
git-245dd15aa9e086d82de7a9c947aa916e6d702f48.tar.xz
Merge branch 'ct/prompt-untracked-fix' into maint
The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files
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 214e859f9..f18aedc73 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -487,7 +487,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