summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-25 12:54:18 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-25 12:54:18 -0700
commit5f15cba2f95f5678fc69bd305dbbb778e1fad579 (patch)
treed2dd6c4b1667f5c3d58f0341e37b62d1a9f848a4 /contrib
parent92e625d3a3a94b9765baf4d54b1fd86117656d30 (diff)
parent9bdc5173f0bc514d0b76165d45729622b2ad4d89 (diff)
downloadgit-5f15cba2f95f5678fc69bd305dbbb778e1fad579.tar.gz
Merge branch 'ct/prompt-untracked-fix'
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 214e859f99..f18aedc73b 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