diff options
| author |  Kevin Ballard <kevin@sb.org> | 2008-03-08 22:10:48 -0500 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-03-10 19:44:40 -0400 |
| commit | a5c4f85b1685aeb01f4dac88075f465c71a6c82d (patch) | |
| tree | b81f82f3c42547b30629496f0509c8a00ff5e1f5 | |
| parent | Add a test for read-tree -u --reset with a D/F conflict (diff) | |
| download | tgif-a5c4f85b1685aeb01f4dac88075f465c71a6c82d.tar.xz | |
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>
| -rwxr-xr-x | contrib/completion/git-completion.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 848c067b57..c29569c624 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |