eac_git 0.18.1 → 0.18.2

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

@@ -9,34 +9,41 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone ../../../$UPSTREAM/bar
+  cd "$OWNER/foo"
+  git subrepo --quiet clone "$UPSTREAM/bar"
 )
 
 test-exists \
   "$OWNER/foo/bar/bard/"
 
+# Test that reclone is not done if not needed.
 export XYZ=1
 is "$(
-  cd $OWNER/foo
-  git subrepo --force clone ../../../$UPSTREAM/bar
+  cd "$OWNER/foo"
+  git subrepo --force clone "$UPSTREAM/bar"
 )" \
   "Subrepo 'bar' is up to date." \
   "No reclone if same commit"
 
+# Test that reclone of a different ref works.
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone --force ../../../$UPSTREAM/bar --branch=refs/tags/A
+  cd "$OWNER/foo"
+  git subrepo --quiet clone --force "$UPSTREAM/bar" --branch=refs/tags/A
 )
 
+is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
+  "Subrepo 'bar' option 'branch' has value 'refs/tags/A'."
 test-exists \
   "!$OWNER/foo/bar/bard/"
 
+# Test that reclone back to (implicit) master works.
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone -f ../../../$UPSTREAM/bar --branch=master
+  cd "$OWNER/foo"
+  git subrepo --quiet clone -f "$UPSTREAM/bar"
 )
 
+is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
+  "Subrepo 'bar' option 'branch' has value 'master'."
 test-exists \
   "$OWNER/foo/bar/bard/"
 

data/vendor/git-subrepo/test/setup

@@ -1,53 +1,59 @@
 #!/usr/bin/env bash
 
+# Set this locally for Windows:
+git config core.autocrlf input
+
 set -e
 
 # Set the GIT_SUBREPO_ROOT for testing.
-source $PWD/.rc
+source "$PWD"/.rc
 
-# Set this locally for Windows:
-git config core.autocrlf input
+# Get the location of this script
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+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"
+export PATH=$BASHLIB:$PATH
 source bash+ :std
 
 source 'lib/git-subrepo'
 
-# TODO: Move to test/tmp
-export TMP="tmp"
-rm -fr $TMP
+export TMP=$SCRIPT_DIR/tmp
+rm -fr "$TMP"
 
-#export GIT_EXEC_PATH="$PWD/lib:$(git --exec-path)"
-export UPSTREAM="$TMP/upstream"
-export OWNER="$TMP/owner"
-export COLLAB="$TMP/collab"
+#export GIT_EXEC_PATH=$PWD/lib:$(git --exec-path)
+export UPSTREAM=$TMP/upstream
+export OWNER=$TMP/owner
+export COLLAB=$TMP/collab
 
 mkdir -p "$UPSTREAM" "$OWNER" "$COLLAB"
 
 cp -r test/repo/{foo,bar,init} "$UPSTREAM/"
 
+DEFAULTBRANCH=$( git config --global --get init.defaultbranch || true )
+[[ -z $DEFAULTBRANCH ]] && DEFAULTBRANCH="master"
+export DEFAULTBRANCH
+
 ###
 # Test helper functions:
 ###
 clone-foo-and-bar() {
   (
     # foo will act as the main repo
-    git clone $UPSTREAM/foo $OWNER/foo
+    git clone "$UPSTREAM/foo" "$OWNER/foo"
     (
-        cd $OWNER/foo
+        cd "$OWNER/foo"
         git config core.autocrlf input
         git config user.name "FooUser"
         git config user.email "foo@foo"
     )
     # bar will act as the subrepo
-    git clone $UPSTREAM/bar $OWNER/bar
+    git clone "$UPSTREAM/bar" "$OWNER/bar"
     (
-        cd $OWNER/bar
+        cd "$OWNER/bar"
         git config core.autocrlf input
         git config user.name "BarUser"
         git config user.email "bar@bar"
@@ -57,23 +63,23 @@ clone-foo-and-bar() {
 
 subrepo-clone-bar-into-foo() {
   (
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar"
   ) &> /dev/null || die
 }
 
 add-new-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "new file $file" > "$file"
-    git add "$file"
+    git add --force "$file"
   done
   git commit --quiet -m "add new file: $file" &> /dev/null
 }
 
 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
@@ -81,7 +87,7 @@ remove-files() {
 
 modify-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo 'a new line' >> "$file"
     git add "$file"
   done
@@ -90,7 +96,7 @@ modify-files() {
 
 modify-files-ex() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "$file" >> "$file"
     git add "$file"
   done
@@ -100,20 +106,20 @@ modify-files-ex() {
 test-exists() {
   for f in "$@"; do
     if [[ $f =~ ^! ]]; then
-      f="${f#!}"
+      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
@@ -121,22 +127,22 @@ test-exists() {
 }
 
 test-exists-in-index() {
-  for f in $*; do
-    if [[ "$f" =~ ^! ]]; then
-      f="${f#!}"
-      if [[ "$f" =~ /$ ]]; then
-        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+  for f in "$@"; do
+    if [[ $f =~ ^! ]]; then
+      f=${f#!}
+      if [[ $f =~ /$ ]]; then
+        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") ]`" \
+      if [[ $f =~ /$ ]]; then
+        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
@@ -144,39 +150,40 @@ test-exists-in-index() {
 }
 
 test-gitrepo-comment-block() {
-  is "$(grep -E '^;' $gitrepo)" "\
+  # shellcheck disable=2154
+  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
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
 ;" \
     'Comment header block is correct'
 }
 
 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_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_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)
 }
 
 assert-original-state() {
-  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_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)
 
   is "$current_head_ref" \
     "$original_head_ref" \
@@ -196,10 +203,10 @@ assert-original-state() {
 }
 
 catch() {
-  local error=; error="$("$@" 2>&1 || true)"
+  local error=; error=$("$@" 2>&1 || true)
   echo "$error"
 }
 
 teardown() {
-  rm -fr $TMP
+  rm -fr "$TMP"
 }

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

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+use Test::More
+
+if ! command -v shellcheck >/dev/null; then
+  plan skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  plan skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  echo .rc
+  find lib -type f
+  echo test/setup
+  find test -name '*.t'
+  echo share/enable-completion.sh
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  is "$(shellcheck -e "$skip" "$file")" "" \
+    "The shell file '$file' passes shellcheck"
+done
+
+done_testing
+
+# vim: set ft=sh:

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

@@ -6,61 +6,81 @@ source test/setup
 
 use Test::More
 
+clone-foo-and-bar
+
+(
+  cd "$OWNER"/foo
+  git subrepo clone "$UPSTREAM"/bar
+  git subrepo clone "$UPSTREAM"/foo bar/foo
+  mkdir lib
+  git subrepo clone "$UPSTREAM"/bar lib/bar
+  git subrepo clone "$UPSTREAM"/foo lib/bar/foo
+) &> /dev/null || die
+
 {
-  output="$(git subrepo status)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --all
+  )
 
   like "$output" "2 subrepos:" \
     "'status' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is not in 'status'"
+  unlike "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is not in 'status'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is not in 'status'"
+  unlike "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is not in 'status'"
 }
 
 {
-  output="$(git subrepo status --ALL)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --ALL
+  )
 
   like "$output" "4 subrepos:" \
     "'status --ALL' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status --ALL'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status --ALL'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is in 'status --ALL'"
+  like "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is in 'status --ALL'"
+  like "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is in 'status --ALL'"
 }
 
 {
-  output="$(git subrepo status --all)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --all
+  )
 
   like "$output" "2 subrepos:" \
     "'status --all' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status --all'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status --all'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status --all'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status --all'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is not in 'status --all'"
+  unlike "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is not in 'status --all'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is not in 'status --all'"
+  unlike "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is not in 'status --all'"
 }
 
 done_testing 15

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

@@ -14,7 +14,7 @@ clone-foo-and-bar
 
 # Add submodule reference along with a new file to the bar repo:
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git clone ../foo submodule
   add-new-files file
   git add submodule file
@@ -22,18 +22,18 @@ clone-foo-and-bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clone ../bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files file
 ) &> /dev/null || die
 
 {
   is "$(
-   cd $OWNER/foo
+   cd "$OWNER/foo"
     git subrepo pull bar
   )" \
     "Subrepo 'bar' pulled from '../bar' (master)." \

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+if ! command -v docker >/dev/null; then
+  plan skip_all "The 'docker' utility is not installed"
+fi
+
+for zsh_version in 5.8 5.6 5.0.1 4.3.11; do
+  error=$(
+    docker run --rm -it \
+      --volume="$PWD:/git-subrepo" \
+      --entrypoint='' \
+        "zshusers/zsh:$zsh_version" \
+        zsh -c 'source /git-subrepo/.rc 2>&1'
+  ) || true
+
+  is "$error" "" "'source.rc' works for zsh-$zsh_version"
+done
+
+done_testing
+
+# vim: set ft=sh: