Support spaces in subrepo path

subrepo residing in a path that contained an element with a space
would fail due to insufficient grouping in some scripts.

Author: admorgan

lib/git-subrepo

@@ -1542,8 +1542,8 @@ add-subrepo() {
 # Determine the upstream's default head branch:
 get-upstream-head-branch() {
   local remotes branch
-  OUT=true RUN git ls-remote --symref $subrepo_remote
-  remotes="$output"
+  OUT=true RUN git ls-remote --symref "$subrepo_remote"
+  remotes=$output
   [[ -n $remotes ]] ||
     error "Failed to 'git ls-remote --symref $subrepo_remote'."
 
@@ -1553,7 +1553,7 @@ get-upstream-head-branch() {
     grep "^ref:" | grep 'HEAD$' | cut -f2 -d':' | cut -f1 |
     head -n1
   )"
-  branch="${branch/ }"
+  branch=${branch/ }
   [[ $branch =~ refs/heads/ ]] ||
     error "Problem finding remote default head branch."
   output="${branch#refs/heads/}"

test/branch.t

@@ -10,38 +10,38 @@ clone-foo-and-bar
 
 subrepo-clone-bar-into-foo
 
-before="$(date -r $OWNER/foo/Foo '+%s')"
+before="$(date -r "$OWNER"/foo/Foo '+%s')"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER"/foo
   add-new-files bar/file
   add-new-files .gitrepo
 )
 
-save-original-state $OWNER/foo bar
+save-original-state "$OWNER"/foo bar
 
 # Make sure that time stamps differ
 sleep 1
 
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER"/foo
   git subrepo branch bar
 )" \
   "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
   "subrepo branch command output is correct"
 
 
-after="$(date -r $OWNER/foo/Foo '+%s')"
-assert-original-state $OWNER/foo bar
+after="$(date -r "$OWNER"/foo/Foo '+%s')"
+assert-original-state "$OWNER"/foo bar
 
 # Check that we haven't checked out any temporary files
 is "$before" "$after" \
   "No modification on Foo"
 
-test-exists "$OWNER/foo/.git/tmp/subrepo/bar/"
+test-exists "$OWNER"/foo/.git/tmp/subrepo/bar/
 
 is "$(
-  cd $OWNER/foo/.git/tmp/subrepo/bar
+  cd "$OWNER"/foo/.git/tmp/subrepo/bar
   git branch | grep \*
 )" \
   "* subrepo/bar" \

test/setup

@@ -6,13 +6,13 @@ git config core.autocrlf input
 set -e
 
 # Set the GIT_SUBREPO_ROOT for testing.
-source $PWD/.rc
+source "$PWD"/.rc
+
+BASHLIB="$(
+  find "$PWD"/ -type d -name bin -o -type d -name lib | tr '\n' ':'
+)"
+export BASHLIB
 
-export BASHLIB="`
-  find $PWD -type d |
-  grep -E '/(bin|lib)$' |
-  xargs -n1 printf "%s:"
-`"
 export PATH="$BASHLIB:$PATH"
 source bash+ :std
 
@@ -64,7 +64,7 @@ subrepo-clone-bar-into-foo() {
 
 add-new-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "new file $file" > "$file"
     git add "$file"
   done
@@ -73,15 +73,15 @@ add-new-files() {
 
 remove-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     git rm "$file"
   done
   git commit --quiet -m "Removed file: $file" &> /dev/null
 }
 
 modify-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo 'a new line' >> "$file"
     git add "$file"
   done
@@ -90,7 +90,7 @@ modify-files() {
 
 modify-files-ex() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "$file" >> "$file"
     git add "$file"
   done
@@ -102,49 +102,49 @@ test-exists() {
     if [[ $f =~ ^! ]]; then
       f="${f#!}"
       if [[ $f =~ /$ ]]; then
-        ok "`[ ! -d "$f" ]`" \
+        ok "$([ ! -d "$f" ])" \
           "Directory '$f' does not exist"
       else
-        ok "`[ ! -f "$f" ]`" \
+        ok "$([ ! -f "$f" ])" \
           "File '$f' does not exist"
       fi
     else
       if [[ $f =~ /$ ]]; then
-        ok "`[ -d "$f" ]`" \
+        ok "$([ -d "$f" ])" \
           "Directory '$f' exists"
       else
-        ok "`[ -f "$f" ]`" \
+        ok "$([ -f "$f" ])" \
           "File '$f' exists"
       fi
     fi
   done
 }
 
 test-exists-in-index() {
-  for f in $*; do
+  for f in "$@"; do
     if [[ "$f" =~ ^! ]]; then
       f="${f#!}"
       if [[ "$f" =~ /$ ]]; then
-        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ ! "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "Directory '$f' does not exist in index"
       else
-        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ ! "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "File '$f' does not exist in index"
       fi
     else
       if [[ "$f" =~ /$ ]]; then
-        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "Directory '$f' exists in index"
       else
-        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "File '$f' exists in index"
       fi
     fi
   done
 }
 
 test-gitrepo-comment-block() {
-  is "$(grep -E '^;' $gitrepo)" "\
+  is "$(grep -E '^;' "$gitrepo")" "\
 ; DO NOT EDIT (unless you know what you are doing)
 ;
 ; This subdirectory is a git \"subrepo\", and this file is maintained by the
@@ -154,29 +154,29 @@ test-gitrepo-comment-block() {
 }
 
 test-gitrepo-field() {
-  is "`git config -f $gitrepo subrepo.$1`" \
+  is "$(git config -f "$gitrepo" subrepo."$1")" \
     "$2" \
     ".gitrepo $1 is correct"
 }
 
 test-commit-count() {
-  is "`cd $1; git rev-list --count $2`" \
+  is "$(cd "$1"; git rev-list --count "$2")" \
     "$3" \
     "commit count is correct"
 }
 
 save-original-state() {
-  original_head_ref="$(cd $1; cat .git/HEAD)"
+  original_head_ref="$(cd "$1"; cat .git/HEAD)"
   original_branch="${original_head_ref#ref: refs/heads/}"
-  original_head_commit="$(cd $1; git rev-parse HEAD)"
-  original_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  original_head_commit="$(cd "$1"; git rev-parse HEAD)"
+  original_gitrepo="$(cd "$1"; cat "$2"/.gitrepo)"
 }
 
 assert-original-state() {
-  current_head_ref="$(cd $1; cat .git/HEAD)"
+  current_head_ref="$(cd "$1"; cat .git/HEAD)"
   current_branch="${current_head_ref#ref: refs/heads/}"
-  current_head_commit="$(cd $1; git rev-parse HEAD)"
-  current_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  current_head_commit="$(cd "$1"; git rev-parse HEAD)"
+  current_gitrepo="$(cd "$1"; cat "$2"/.gitrepo)"
 
   is "$current_head_ref" \
     "$original_head_ref" \