Merge branch 'jk/prompt-stash-could-be-packed'
The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR
This commit is contained in:
commit
64014894cf
@ -468,7 +468,8 @@ __git_ps1 ()
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
|
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
|
||||||
[ -r "$g/refs/stash" ]; then
|
git rev-parse --verify --quiet refs/stash >/dev/null
|
||||||
|
then
|
||||||
s="$"
|
s="$"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user