(unknown)
- From
- cody.taylor@maternityneighborhood.com <cody.taylor@maternityneighborhood.com>
- Date
- Mar 13, 2015, 01:34 UTC
- Message-ID
- <20150313012620.11094.40096@catuvm>
>From 3e4e22e93bf07355b40ba0abcb3a15c4941cfee7 Mon Sep 17 00:00:00 2001
From: Cody A Taylor <codemister99@yahoo.com> Date: Thu, 12 Mar 2015 20:36:44 -0400 Subject: [PATCH] git prompt: Use toplevel to find untracked files.
The __git_ps1() prompt function would not show an untracked state when the current working directory was not a parent of the untracked file.
Signed-off-by: Cody A Taylor <codemister99@yahoo.com> --- contrib/completion/git-prompt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 214e859f99e7..f0d8a2669236 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -487,7 +487,8 @@ __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 -- \ + "$(git rev-parse --show-toplevel)/*" >/dev/null 2>/dev/null then u="%${ZSH_VERSION+%}" fi
-- 2.3.2