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>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 848c067b57398154de6dc5287648b4103841217a..c29569c6247c346ceb409f72ff8e135929e11141 100755 (executable)
--- 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"
                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"
                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
                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
                        then
                                r="|BISECTING"
                        fi


@@ -101,7 +101,7 @@ __git_ps1 ()
                        then
                                if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
                                then
                        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
                                fi
                        fi
                fi