eac_git 0.18.1 → 0.18.2

data/vendor/git-subrepo/test/error.t

@@ -13,8 +13,8 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
-      git subrepo --quiet clone ../../../$UPSTREAM/foo
+      cd "$OWNER/bar"
+      git subrepo --quiet clone "$UPSTREAM/foo"
       add-new-files foo/file
       git subrepo --quiet branch foo
       catch git subrepo branch foo
@@ -23,7 +23,7 @@ clone-foo-and-bar
     "Error OK: can't create a branch that exists"
 
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git subrepo --quiet clean foo
     git reset --quiet --hard HEAD^
   )
@@ -55,7 +55,7 @@ clone-foo-and-bar
 
 {
   like "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo pull /home/user/bar/foo
     )" \
     "git-subrepo: The subdir '.*/home/user/bar/foo' should not be absolute path." \
@@ -66,8 +66,8 @@ clone-foo-and-bar
   # XXX add 'commit' to cmds here when implemented:
   for cmd in pull push fetch branch commit clean; do
     is "$(
-        cd $OWNER/bar
-        catch git subrepo $cmd
+        cd "$OWNER/bar"
+        catch git subrepo "$cmd"
       )" \
       "git-subrepo: Command '$cmd' requires arg 'subdir'." \
       "Error OK: check that '$cmd' requires subdir"
@@ -76,7 +76,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone foo bar baz quux
     )" \
     "git-subrepo: Unknown argument(s) 'baz quux' for 'clone' command." \
@@ -85,7 +85,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone .git
     )" \
     "git-subrepo: Can't determine subdir from '.git'." \
@@ -94,7 +94,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo pull lala
     )" \
     "git-subrepo: No 'lala/.gitrepo' file." \
@@ -103,14 +103,14 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
-      git checkout --quiet $(git rev-parse master)
+      cd "$OWNER/bar"
+      git checkout --quiet "$(git rev-parse master)"
       catch git subrepo status
     )" \
     "git-subrepo: Must be on a branch to run this command." \
     "Error OK: check repo is on a branch"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git checkout --quiet master
   )
 }
@@ -126,15 +126,15 @@ clone-foo-and-bar
 
 {
   like "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       touch me
       git add me
-      catch git subrepo clone ../../../$UPSTREAM/foo
+      catch git subrepo clone "$UPSTREAM/foo"
     )" \
     "git-subrepo: Can't clone subrepo. Working tree has changes." \
     "Error OK: check no working tree changes"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git reset --quiet --hard
   )
 }
@@ -150,7 +150,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone dummy bard
     )" \
     "git-subrepo: The subdir 'bard' exists and is not empty." \
@@ -159,10 +159,10 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone dummy-repo
     )" \
-    "git-subrepo: Command failed: 'git ls-remote dummy-repo'." \
+    "git-subrepo: Command failed: 'git ls-remote --symref dummy-repo'." \
     "Error OK: clone non-repo"
 }
 

data/vendor/git-subrepo/test/fetch.t

@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git tag -a CoolTag -m "Should stay in subrepo"
   git push
@@ -21,17 +21,17 @@ subrepo-clone-bar-into-foo
 # Fetch information
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo fetch bar
   )" \
-    "Fetched 'bar' from '../../../tmp/upstream/bar' (master)." \
+    "Fetched 'bar' from '$UPSTREAM/bar' (master)." \
     'subrepo fetch command output is correct'
 }
 
 # Check that there is no tags fetched
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git tag -l 'CoolTag'
   )" \
     "" \

data/vendor/git-subrepo/test/gitignore.t

@@ -11,13 +11,13 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   echo ".*" >> .gitignore
   git add .gitignore
   git commit -m "Add gitignore"
@@ -29,10 +29,10 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo pull bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
@@ -46,14 +46,14 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  test-gitrepo-field "remote" "$UPSTREAM/bar"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 done_testing

data/vendor/git-subrepo/test/init.t

@@ -6,7 +6,7 @@ source test/setup
 
 use Test::More
 
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 
 gitrepo=$OWNER/init/doc/.gitrepo
 
@@ -20,10 +20,10 @@ gitrepo=$OWNER/init/doc/.gitrepo
     "!$gitrepo"
 }
 
-output="$(
+output=$(
   cd "$OWNER/init"
   git subrepo init doc
-)"
+)
 
 is "$output" "Subrepo created from 'doc' (with no remote)." \
   'Command output is correct'
@@ -35,18 +35,17 @@ is "$output" "Subrepo created from 'doc' (with no remote)." \
 
 # Test init/doc/.gitrepo file contents:
 {
-  init_clone_commit="$(cd $OWNER/init; git rev-parse HEAD^)"
   test-gitrepo-comment-block
   test-gitrepo-field "remote" "none"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" ""
   test-gitrepo-field "parent" ""
   test-gitrepo-field "method" "merge"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 rm -fr "$OWNER/init"
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 (
   cd "$OWNER/init"
   git subrepo init doc -r git@github.com:user/repo -b foo -M rebase
@@ -57,7 +56,7 @@ test-gitrepo-field "branch" "foo"
 test-gitrepo-field "commit" ""
 test-gitrepo-field "parent" ""
 test-gitrepo-field "method" "rebase"
-test-gitrepo-field "cmdver" "`git subrepo --version`"
+test-gitrepo-field "cmdver" "$(git subrepo --version)"
 
 done_testing
 

data/vendor/git-subrepo/test/issue29.t

@@ -40,7 +40,7 @@ cd "$TMP"
   touch main1
   git add main1
   git commit -m "Initial main1"
-  git subrepo clone ../share share -b master
+  git subrepo clone ../share share -b "$DEFAULTBRANCH"
 ) > /dev/null
 
 # `subrepo clone` the share repo into main2:
@@ -49,7 +49,7 @@ cd "$TMP"
   touch main2
   git add main2
   git commit -m "Initial main2"
-  git subrepo clone ../share share -b master
+  git subrepo clone ../share share -b "$DEFAULTBRANCH"
 ) > /dev/null
 
 
@@ -64,7 +64,7 @@ msg_main1="main1 initial add to subrepo"
   git subrepo push share
 ) &> /dev/null
 
-ok "`! git:branch-exists "subrepo-push/share"`" \
+ok "$(! git:branch-exists "subrepo-push/share")" \
   "The subrepo-push/share branch was deleted after push"
 
 # TODO Check the state of refs made

data/vendor/git-subrepo/test/issue95.t

@@ -46,7 +46,7 @@ use Test::More
         touch feature
         git add feature
         git commit -m "feature added"
-        git checkout master
+        git checkout "$DEFAULTBRANCH"
     ) &> /dev/null
 
     # Commit directly to subrepo
@@ -89,7 +89,7 @@ use Test::More
             cd host
             git subrepo pull sub
     )" \
-        "Subrepo 'sub' pulled from '../sub' (master)."
+        "Subrepo 'sub' pulled from '../sub' ($DEFAULTBRANCH)."
 
 }
 

data/vendor/git-subrepo/test/issue96.t

@@ -81,15 +81,15 @@ use Test::More
             cd host
             git subrepo pull sub
     )" \
-        "Subrepo 'sub' pulled from '../sub' (master)."
+        "Subrepo 'sub' pulled from '../sub' ($DEFAULTBRANCH)."
 
     # Push subrepo changes
     # expected: successful push without conflicts
     is "$(
             cd host
-            git subrepo push sub -b master -u
+            git subrepo push sub -b "$DEFAULTBRANCH" -u
     )" \
-       "Subrepo 'sub' pushed to '../sub' (master)."
+       "Subrepo 'sub' pushed to '../sub' ($DEFAULTBRANCH)."
 
 done_testing 2
 

data/vendor/git-subrepo/test/pull-all.t

@@ -9,26 +9,26 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clone ../bar bar1
   git subrepo clone ../bar bar2
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files Bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull --all
 ) &> /dev/null || die
 
 {
-  is "$(cat $OWNER/foo/bar1/Bar)" \
+  is "$(cat "$OWNER/foo/bar1/Bar")" \
     "a new line" \
     'bar1/Bar content correct'
-  is "$(cat $OWNER/foo/bar2/Bar)" \
+  is "$(cat "$OWNER/foo/bar2/Bar")" \
     "a new line" \
     'bar2/Bar content correct'
 }

data/vendor/git-subrepo/test/pull-merge.t

@@ -13,37 +13,38 @@ subrepo-clone-bar-into-foo
 note "Pull - Conflict - Merge ours/theirs - Push"
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
+# shellcheck disable=2034
 gitrepo=$OWNER/foo/bar/.gitrepo
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD^)"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD^)
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
 }
 
-foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD)"
+foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD)
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
   modify-files-ex bar/Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files-ex Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || {
       cd .git/tmp/subrepo/bar
       echo "Merged Bar2" > Bar2
@@ -59,13 +60,13 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the mainrepo is merged"
 
 # Check commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "git subrepo commit \(merge\) bar" \
       "subrepo pull should have merge message"
@@ -73,26 +74,26 @@ is "$(cat $OWNER/foo/bar/Bar2)" \
 
 # Test foo/bar/.gitrepo file contents:
 {
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
 }
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo push bar
 ) &> /dev/null || die
 
 # Check commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "git subrepo push bar" \
       "subrepo push should not have merge message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -100,11 +101,11 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the mainrepo is merged"
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the subrepo is merged"
 

data/vendor/git-subrepo/test/pull-message.t

@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
@@ -20,23 +20,23 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -m:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo pull -m 'Hello World' bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -m commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "Hello World" \
       "subrepo pull commit message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar3
   git push
 ) &> /dev/null || die
@@ -44,23 +44,23 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -e:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     GIT_EDITOR='echo cowabunga >' git subrepo pull -e bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -e commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
   like "$foo_new_commit_message" \
       "cowabunga" \
       "subrepo pull edit commit message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar4
   git push
 ) &> /dev/null || die
@@ -68,16 +68,16 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -e and -m:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     GIT_EDITOR=true git subrepo pull -e -m original bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -e commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
   like "$foo_new_commit_message" \
       "original" \
       "subrepo pull edit and message commit message"

data/vendor/git-subrepo/test/pull-new-branch.t

@@ -15,13 +15,14 @@ subrepo-clone-bar-into-foo
 ) &> /dev/null || die
 
 # Test subrepo file content:
+# shellcheck disable=2034
 gitrepo=$OWNER/foo/bar/.gitrepo
 
 {
-  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar" || exit; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field remote "../../../$UPSTREAM/bar"
+  test-gitrepo-field remote "$UPSTREAM/bar"
   test-gitrepo-field branch master
   test-gitrepo-field commit "$bar_head_commit"
   test-gitrepo-field parent "$foo_pull_commit"
@@ -34,10 +35,10 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 ) &> /dev/null || die
 
 {
-  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar" || exit; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field remote "../../../$UPSTREAM/bar"
+  test-gitrepo-field remote "$UPSTREAM/bar"
   test-gitrepo-field branch branch1
   test-gitrepo-field commit "$bar_head_commit"
   test-gitrepo-field parent "$foo_pull_commit"
@@ -46,7 +47,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo" || exit
     git subrepo pull bar
   )" \
     "Subrepo 'bar' is up to date." \

data/vendor/git-subrepo/test/pull-ours.t

@@ -19,13 +19,13 @@ note "Pull - Conflict - Use ours - Push"
 #
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
   modify-files-ex bar/Bar2
   cat bar/Bar2
@@ -33,15 +33,15 @@ note "Pull - Conflict - Use ours - Push"
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files-ex Bar2
   git push
 ) &> /dev/null || die
 
-before="$(date -r $OWNER/foo/Foo '+%s')"
+before=$(date -r "$OWNER/foo/Foo" '+%s')
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || {
       cd .git/tmp/subrepo/bar
       git checkout --ours Bar2
@@ -54,7 +54,7 @@ before="$(date -r $OWNER/foo/Foo '+%s')"
 ) &> /dev/null || die
 
 sleep 1
-after="$(date -r $OWNER/foo/Foo '+%s')"
+after=$(date -r "$OWNER/foo/Foo" '+%s')
 
 is "$before" "$after" \
   "No modification on Foo"
@@ -63,17 +63,17 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "new file Bar2"$'\n'"bar/Bar2" \
   "The readme file in the mainrepo is ours"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo push bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -81,7 +81,7 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "new file Bar2"$'\n'"bar/Bar2" \
   "The readme file in the subrepo is ours"