completion: Better __git_ps1 support when not in working directory
If .git/HEAD is not readable, __git_ps1 does nothing. If --is-in-git-dir, __git_ps1 returns " (GIT_DIR!)" as a cautionary note. The previous behavior would show the branch name (and would optionally attempt to determine the dirtyState of the directory, which was impossible because a "git diff" was used). If --is-in-work-tree, __git_ps1 returns the branch name. Additionally, if showDirtyState is on, the dirty state is displayed. Signed-off-by: Ted Pavlic <ted@tedpavlic.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
ad244d2568
commit
e5dd864adf
|
@ -108,7 +108,9 @@ __git_ps1 ()
|
||||||
fi
|
fi
|
||||||
if ! b="$(git symbolic-ref HEAD 2>/dev/null)"; then
|
if ! b="$(git symbolic-ref HEAD 2>/dev/null)"; then
|
||||||
if ! b="$(git describe --exact-match HEAD 2>/dev/null)"; then
|
if ! b="$(git describe --exact-match HEAD 2>/dev/null)"; then
|
||||||
b="$(cut -c1-7 "$g/HEAD")..."
|
if [ -r "$g/HEAD" ]; then
|
||||||
|
b="$(cut -c1-7 "$g/HEAD")..."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -116,23 +118,29 @@ __git_ps1 ()
|
||||||
local w
|
local w
|
||||||
local i
|
local i
|
||||||
|
|
||||||
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
|
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
|
||||||
if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
|
b="GIT_DIR!"
|
||||||
git diff --no-ext-diff --ignore-submodules \
|
elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
|
||||||
--quiet --exit-code || w="*"
|
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
|
||||||
if git rev-parse --quiet --verify HEAD >/dev/null; then
|
if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
|
||||||
git diff-index --cached --quiet \
|
git diff --no-ext-diff --ignore-submodules \
|
||||||
--ignore-submodules HEAD -- || i="+"
|
--quiet --exit-code || w="*"
|
||||||
else
|
if git rev-parse --quiet --verify HEAD >/dev/null; then
|
||||||
i="#"
|
git diff-index --cached --quiet \
|
||||||
|
--ignore-submodules HEAD -- || i="+"
|
||||||
|
else
|
||||||
|
i="#"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "${1-}" ]; then
|
if [ -n "$b" ]; then
|
||||||
printf "$1" "${b##refs/heads/}$w$i$r"
|
if [ -n "${1-}" ]; then
|
||||||
else
|
printf "$1" "${b##refs/heads/}$w$i$r"
|
||||||
printf " (%s)" "${b##refs/heads/}$w$i$r"
|
else
|
||||||
|
printf " (%s)" "${b##refs/heads/}$w$i$r"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue