mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/completion/git-completion.bash
View File

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