bash: Properly quote the GIT_DIR at all times to fix subdirectory paths with spaces

Signed-off-by: Kevin Ballard <kevin@sb.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Kevin Ballard 2008-03-08 22:10:48 -05:00 committed by Shawn O. Pearce
parent 50753d00d6
commit a5c4f85b16

View file

@ -83,17 +83,17 @@ __git_ps1 ()
elif [ -f "$g/.dotest-merge/interactive" ]
then
r="|REBASE-i"
b="$(cat $g/.dotest-merge/head-name)"
b="$(cat "$g/.dotest-merge/head-name")"
elif [ -d "$g/.dotest-merge" ]
then
r="|REBASE-m"
b="$(cat $g/.dotest-merge/head-name)"
b="$(cat "$g/.dotest-merge/head-name")"
elif [ -f "$g/MERGE_HEAD" ]
then
r="|MERGING"
b="$(git symbolic-ref HEAD 2>/dev/null)"
else
if [ -f $g/BISECT_LOG ]
if [ -f "$g/BISECT_LOG" ]
then
r="|BISECTING"
fi
@ -101,7 +101,7 @@ __git_ps1 ()
then
if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
then
b="$(cut -c1-7 $g/HEAD)..."
b="$(cut -c1-7 "$g/HEAD")..."
fi
fi
fi