summaryrefslogtreecommitdiffstats
path: root/bashrc
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-02-02 04:47:37 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2011-02-02 04:47:37 +0100
commit0887607b7a5d957ff2e3cd91b9cb960e78a63881 (patch)
treebb8778877a4cca509d8cd1f50c2f257a8162ea45 /bashrc
parent405a000c2736f89ad2ab705fab1b0054b7a7b5b8 (diff)
downloaddotfiles-0887607b7a5d957ff2e3cd91b9cb960e78a63881.tar.gz
dotfiles-0887607b7a5d957ff2e3cd91b9cb960e78a63881.tar.xz
dotfiles-0887607b7a5d957ff2e3cd91b9cb960e78a63881.zip
fix handling of folders in .git directory
Diffstat (limited to 'bashrc')
-rw-r--r--bashrc/common/prompt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bashrc/common/prompt.sh b/bashrc/common/prompt.sh
index 73bd061..86f6919 100644
--- a/bashrc/common/prompt.sh
+++ b/bashrc/common/prompt.sh
@@ -47,7 +47,7 @@ __make_prompt() {
s="$(pcolor yellow)r$r$(pcolor red)$(svn status | grep -q -v '^?' && echo -n "*" )"
else
local d=$(git rev-parse --git-dir 2>/dev/null ) b= r= a=
- if [[ -n "${d}" && "${d}" != "." && ! -f "${d}/../.promptignore" ]] ; then
+ if [[ -n "${d}" && "${d}" != "." && "${PWD}" == "${PWD##$d}" && ! -f "${d}/../.promptignore" ]] ; then
if [[ -d "${d}/../.dotest" ]] ; then
if [[ -f "${d}/../.dotest/rebase" ]] ; then
r="rebase"