eac_git 0.18.1 → 0.18.2

data/vendor/git-subrepo/share/zsh-completion/_git-subrepo

@@ -3,11 +3,6 @@
 
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
-	echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
-	return 3
-fi
-
 _git-subrepo() {
     typeset -A opt_args
     local curcontext="$curcontext" state line context
@@ -24,9 +19,9 @@ _git-subrepo() {
         '(-e --edit)'{-e,--edit}'[Edit commit message]' \
         '(-f --force)'{-f,--force}'[Force certain operations]' \
         '(-F --fetch)'{-F,--fetch}'[Fetch the upstream content first]' \
-        '(-M --method)'{-M,--method}'[Method when you join, valid options are '"'"'merge'"'"' or '"'"'rebase'"'"']:M' \
-        '--Default[is '"'"'merge'"'"']' \
+        '(-M --method)'{-M,--method}'[Join method: '"'"'merge'"'"' (default) or '"'"'rebase'"'"']:M' \
         '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
+        '--file[Specify a commit message file]:file' \
         '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
         '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
         '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \

data/vendor/git-subrepo/test/Dockerfile

@@ -0,0 +1,112 @@
+FROM ubuntu:20.04
+
+RUN apt-get update
+
+RUN apt-get install -y \
+        bison \
+        build-essential \
+        git \
+        vim \
+        wget \
+ && true
+
+# Install shellcheck-0.7.1
+RUN cd /root \
+ && wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz \
+ && tar xf shellcheck-v0.7.1.linux.x86_64.tar.xz \
+ && mv shellcheck-v0.7.1/shellcheck /usr/local/bin/ \
+ && rm -fr shellcheck* \
+ && true
+
+# Build/install bash-3.2.57
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz \
+ && tar -xzf bash-3.2.57.tar.gz \
+ && cd bash-3.2.57 \
+ && ./configure --prefix=/bash-3.2 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-4.0
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz \
+ && tar -xzf bash-4.0.tar.gz \
+ && cd bash-4.0 \
+ && ./configure --prefix=/bash-4.0 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-4.1
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz \
+ && tar -xzf bash-4.1.tar.gz \
+ && cd bash-4.1 \
+ && ./configure --prefix=/bash-4.1 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-4.2
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz \
+ && tar -xzf bash-4.2.tar.gz \
+ && cd bash-4.2 \
+ && ./configure --prefix=/bash-4.2 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-4.3
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz \
+ && tar -xzf bash-4.3.tar.gz \
+ && cd bash-4.3 \
+ && ./configure --prefix=/bash-4.3 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-4.4
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz \
+ && tar -xzf bash-4.4.tar.gz \
+ && cd bash-4.4 \
+ && ./configure --prefix=/bash-4.4 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-5.0
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz \
+ && tar -xzf bash-5.0.tar.gz \
+ && cd bash-5.0 \
+ && ./configure --prefix=/bash-5.0 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+# Buil/install bash-5.1-rc1
+RUN cd /root \
+ && wget https://ftp.gnu.org/gnu/bash/bash-5.1-rc1.tar.gz \
+ && tar -xzf bash-5.1-rc1.tar.gz \
+ && cd bash-5.1-rc1 \
+ && ./configure --prefix=/bash-5.1 \
+ && make \
+ && make install \
+ && rm -fr bash* \
+ && true
+
+RUN git config --global user.email "you@example.com" \
+ && git config --global user.name "Your Name" \
+ && git config --global --add safe.directory /git-subrepo/.git \
+ && true

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

@@ -11,26 +11,26 @@ note "Test commands work using --all flag"
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
-  git subrepo clone --quiet ../../../$UPSTREAM/bar one
-  git subrepo clone --quiet ../../../$UPSTREAM/bar two
+  cd "$OWNER/foo"
+  git subrepo clone --quiet "$UPSTREAM/bar" one
+  git subrepo clone --quiet "$UPSTREAM/bar" two
   add-new-files two/file
 )
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo branch --all &> /dev/null
 )" "branch command works with --all even when a subrepo has no new commits"
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git:branch-exists subrepo/two
 )" "The 'subrepo/two' branch exists"
 
 test-exists "$OWNER/foo/.git/tmp/subrepo/two/"
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git:branch-exists subrepo/one
 )" "The 'subrepo/one' branch exists"
 

data/vendor/git-subrepo/test/branch-rev-list-one-path.t

@@ -11,11 +11,11 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   branchpoint=$(git rev-parse HEAD)
   add-new-files bar/file1
   add-new-files bar/file2
-  git checkout -b other $branchpoint
+  git checkout -b other "$branchpoint"
   add-new-files bar/file3
   add-new-files bar/file4
   add-new-files bar/file5
@@ -25,18 +25,17 @@ subrepo-clone-bar-into-foo
 test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3" "$OWNER/foo/bar/file4" "$OWNER/foo/bar/file5"
 
 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"
 
-is $(
-  cd $OWNER/foo
+got="$(
+  cd "$OWNER/foo"
   git rev-list subrepo/bar | wc -l
-) \
-  6 \
-  "We have only created commits for one of the paths"
+)"
+is "${got// /}" "6" "We have only created commits for one of the paths"
 
 done_testing
 

data/vendor/git-subrepo/test/branch-rev-list.t

@@ -11,14 +11,14 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   branchpoint=$(git rev-parse HEAD)
   add-new-files bar/file1
   # We push here to force subrepo to handle
   # histories where it's not first parent
   git subrepo push bar
   add-new-files bar/file2
-  git checkout -b other $branchpoint
+  git checkout -b other "$branchpoint"
   add-new-files bar/file3
   add-new-files bar/file4
   add-new-files bar/file5
@@ -29,18 +29,17 @@ test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3"
 
 # -F is needed for branch to fetch new information
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo -F branch bar
 )" \
   "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
   "subrepo branch command output is correct"
 
-is $(
-  cd $OWNER/foo
+got="$(
+  cd "$OWNER/foo"
   git rev-list subrepo/bar | wc -l
-) \
-  5 \
-  "We have only created commits for one of the paths"
+)"
+is "${got// /}" "5" "We have only created commits for one of the paths"
 
 done_testing
 

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

@@ -10,39 +10,39 @@ 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
-  git branch | grep \*
+  cd "$OWNER"/foo/.git/tmp/subrepo/bar
+  git branch | grep '\*'
 )" \
   "* subrepo/bar" \
   "Correct branch is checked out"

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

@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/file
   git subrepo --quiet branch bar
 )
@@ -21,7 +21,7 @@ test-exists \
   "$OWNER/foo/.git/refs/subrepo/bar/fetch"
 
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clean bar
 )" \
   "Removed branch 'subrepo/bar'." \
@@ -31,7 +31,7 @@ test-exists \
   "!$OWNER/foo/.git/refs/heads/subrepo/bar"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clean --force bar
 )
 

data/vendor/git-subrepo/test/clone-annotated-tag.t

@@ -9,17 +9,17 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git tag -a annotated_tag -m "My annotated tag"
   git tag lightweight_tag
 ) # >& /dev/null || die
 
 # Do the subrepo clone with tag and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
+  clone_output=$(
+    cd "$OWNER/foo"
     git subrepo clone ../bar/.git -b lightweight_tag light
-  )"
+  )
 
   # Check output is correct:
   is "$clone_output" \
@@ -29,10 +29,10 @@ clone-foo-and-bar
 
 # Do the subrepo clone with tag and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
+  clone_output=$(
+    cd "$OWNER/foo"
     git subrepo clone ../bar/.git -b annotated_tag ann 2>&1 || true
-  )"
+  )
 
   # Check output is correct:
   is "$clone_output" \

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

@@ -26,32 +26,27 @@ clone-foo-and-bar
 
 # Do the subrepo clone and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar
-  )"
+  clone_output=$(
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar"
+  )
 
   # Check output is correct:
   is "$clone_output" \
-    "Subrepo '../../../tmp/upstream/bar' (master) cloned into 'bar'." \
+    "Subrepo '$UPSTREAM/bar' (master) cloned into 'bar'." \
     'subrepo clone command output is correct'
 
-  remote_output="$(
-    cd $OWNER/foo
-    git remote -v
-  )"
-
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git remote -v | grep subrepo/bar
   )" \
     "" \
     'No remotes created'
 
-  clone_output_empty="$(
-    cd $OWNER/empty
-    catch git subrepo clone ../../../$UPSTREAM/bar
-  )"
+  clone_output_empty=$(
+    cd "$OWNER/empty"
+    catch git subrepo clone "$UPSTREAM/bar"
+  )
 
   # Check output is correct:
   is "$clone_output_empty" \
@@ -71,31 +66,31 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_clone_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  foo_clone_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_clone_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 # Make sure status is clean:
 {
-  git_status="$(
-    cd $OWNER/foo
+  git_status=$(
+    cd "$OWNER/foo"
     git status -s
-  )"
+  )
 
   is "$git_status" \
     "" \
     'status is clean'
 
-  git_status_empty="$(
-    cd $OWNER/empty
+  git_status_empty=$(
+    cd "$OWNER/empty"
     git status -s
-  )"
+  )
 
   is "$git_status_empty" \
     "" \

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

@@ -6,8 +6,9 @@ source test/setup
 
 use Test::More
 
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 
+# shellcheck disable=2034
 gitrepo=$OWNER/init/doc/.gitrepo
 
 (
@@ -22,11 +23,11 @@ gitrepo=$OWNER/init/doc/.gitrepo
   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)"
 }
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   git subrepo config doc method rebase
 )" \
   "Subrepo 'doc' option 'method' set to 'rebase'."
@@ -37,17 +38,17 @@ is "$(
   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)"
 }
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   git subrepo config doc method
 )" \
   "Subrepo 'doc' option 'method' has value 'rebase'."
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   catch git subrepo config doc branch new
 )" \
   "git-subrepo: This option is autogenerated, use '--force' to override."

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

@@ -6,31 +6,30 @@ source test/setup
 
 use Test::More
 
-
 export round=0
 test_round() {
   clone-foo-and-bar
 
   round=$(( round + 1 ))
-  normalize_dir="$1"
-  normalize_dir="${normalize_dir#./}"
-  normalize_dir="${normalize_dir%/}"
+  normalize_dir=$1
+  normalize_dir=${normalize_dir#./}
+  normalize_dir=${normalize_dir%/}
   while [[ $normalize_dir =~ (//+) ]]; do normalize_dir=${normalize_dir//${BASH_REMATCH[1]}/\/}; done
 
-  clone_output="$(
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar -- "$normalize_dir"
-  )"
+  clone_output=$(
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar" -- "$normalize_dir"
+  )
 
   # Check output is correct:
   is "$clone_output" \
-    "Subrepo '../../../tmp/upstream/bar' (master) cloned into '$normalize_dir'." \
+    "Subrepo '$UPSTREAM/bar' (master) cloned into '$normalize_dir'." \
     'subrepo clone command output is correct'
 
   test-exists "$OWNER/foo/$normalize_dir/"
 
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git pull
     add-new-files Bar2-$round
     git push
@@ -39,10 +38,10 @@ test_round() {
   # Do the pull and check output:
   {
     is "$(
-       cd $OWNER/foo
+       cd "$OWNER/foo"
        git subrepo pull -- "$normalize_dir"
        )" \
-       "Subrepo '$normalize_dir' pulled from '../../../tmp/upstream/bar' (master)." \
+       "Subrepo '$normalize_dir' pulled from '$UPSTREAM/bar' (master)." \
        'subrepo pull command output is correct'
   }
 
@@ -58,10 +57,10 @@ test_round() {
   # Do the push and check output:
   {
     is "$(
-       cd $OWNER/foo
+       cd "$OWNER/foo"
        git subrepo push -- "$normalize_dir"
        )" \
-       "Subrepo '$normalize_dir' pushed to '../../../tmp/upstream/bar' (master)." \
+       "Subrepo '$normalize_dir' pushed to '$UPSTREAM/bar' (master)." \
        'subrepo push command output is correct'
   }
 }
@@ -71,9 +70,9 @@ test_round .dot
 test_round ......dots
 test_round 'spa ce'
 test_round 'per%cent'
-test_round 'back-sl\ash'
+test_round 'back-sl\as/h'
 test_round 'end-with.lock'
-test_round '@'
+# test_round '@'  # TODO Fix. This broke on recent git version...
 test_round '@{'
 test_round '['
 test_round '-begin-with-minus'
@@ -84,7 +83,8 @@ test_round 'many////slashes'
 test_round '_under_scores_'
 
 test_round '.str%a\nge...'
-test_round '~////......s:a^t?r a*n[g@{e.lock'
+test_round ~'////......s:a^t?r a*n[g@{e.lock'
+
 
 done_testing