eac_git 0.18.1 → 0.18.2

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

@@ -19,26 +19,26 @@ note "Pull - Conflict - Use theirs - 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
   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
       git checkout --theirs Bar2
@@ -54,18 +54,18 @@ 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'"Bar2" \
   "The readme file in the mainrepo is theirs"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   cat bar/Bar2
   git subrepo push bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -73,7 +73,7 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "new file Bar2"$'\n'"Bar2" \
   "The readme file in the subrepo is theirs"
 

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

@@ -11,26 +11,26 @@ 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"
   add-new-files bar/Foo2
   git push
   git subrepo pull bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar3
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
 ) &> /dev/null || die
 

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

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

data/vendor/git-subrepo/test/pull.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,10 +20,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'
 }
 
@@ -37,33 +37,33 @@ 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)"
 }
 
 # 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 pull bar" \
       "Subrepo pull commit message OK"
-  bar_commit_short="$(git rev-parse --short $bar_head_commit)"
+  bar_commit_short=$(git rev-parse --short "$bar_head_commit")
   like "$foo_new_commit_message" \
-      'merged:   \"'$bar_commit_short \
+      "merged:   \"$bar_commit_short" \
       "Pull commit contains merged"
 }
 
 # Check that we detect that we don't need to pull
 {
   is "$(
-    cd $OWNER/foo
-    git subrepo pull bar 
+    cd "$OWNER/foo"
+    git subrepo pull bar
   )" \
     "Subrepo 'bar' is up to date." \
     'subrepo detects that we dont need to pull'
@@ -72,7 +72,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 # Test pull if we have rebased the original subrepo so that our clone
 # commit is no longer present in the history
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git reset --hard master^^
   add-new-files Bar3
   git push --force
@@ -84,7 +84,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 }
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || touch pull_failed
 ) &> /dev/null || die
 

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

@@ -10,8 +10,8 @@ use Test::More
 # cases when you don't have any previous commits to rely on
 # see issue/122
 (
-  mkdir -p $OWNER/init
-  cd $OWNER/init
+  mkdir -p "$OWNER/init"
+  cd "$OWNER/init"
   git init
   mkdir doc
   add-new-files doc/FooBar
@@ -20,15 +20,16 @@ use Test::More
   git init --bare ../upstream || die
 ) &> /dev/null
 
-output="$(
-  cd $OWNER/init
+output=$(
+  cd "$OWNER/init"
   git subrepo push doc --remote=../upstream
-)"
+)
 
 is "$output" "Subrepo 'doc' pushed to '../upstream' (master)." \
   'Command output is correct'
 
 # Test init/doc/.gitrepo file contents:
+# shellcheck disable=2034
 gitrepo=$OWNER/init/doc/.gitrepo
 {
   test-gitrepo-field "remote" "../upstream"
@@ -36,7 +37,7 @@ gitrepo=$OWNER/init/doc/.gitrepo
 }
 
 (
-  cd $OWNER
+  cd "$OWNER"
   git clone upstream up
 ) &>/dev/null
 

data/vendor/git-subrepo/test/push-after-push-no-changes.t

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+subrepo-clone-bar-into-foo
+
+{
+  message=$(
+    cd "$OWNER/foo"
+    git subrepo push bar > /dev/null
+    add-new-files bar/Bar1
+    catch git subrepo push bar
+  )
+
+  is "$message" \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
+    "Output OK: Check that 'push' after an empty push works."
+}
+
+done_testing 1
+
+teardown

data/vendor/git-subrepo/test/push-force.t

@@ -11,19 +11,19 @@ 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"
   add-new-files bar/Foo1
   git subrepo push bar --force
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
 ) &> /dev/null || die
 
@@ -34,17 +34,18 @@ test-exists \
 # Pull here will actually merge the old master with the new one
 (
   set +x
-  cd $OWNER/bar
-  git pull
+  cd "$OWNER/bar"
+  git pull --rebase=false
 ) &> /dev/null || die
 
 test-exists \
   "$OWNER/bar/Bar2" \
   "$OWNER/bar/Foo1" \
 
+
 # Test that a fresh repo is not contaminated
 (
-  git clone $UPSTREAM/bar $OWNER/newbar
+  git clone "$UPSTREAM/bar" "$OWNER/newbar"
 ) &> /dev/null || die
 
 test-exists \

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

@@ -11,10 +11,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a commit:
   add-new-files bar/FooBar
@@ -22,23 +22,23 @@ clone-foo-and-bar
 
 # Do the subrepo push to another branch:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --branch newbar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (newbar)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (newbar)." \
     'First push message is correct '
 }
 
 # Do the subrepo push to another branch again:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --branch newbar
-  )"
+  )
 
   # Test the output:
   is "$message" \
@@ -48,7 +48,7 @@ clone-foo-and-bar
 
 # Pull the changes from UPSTREAM/bar in OWNER/bar
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git fetch
   git checkout newbar
 ) &> /dev/null || die

data/vendor/git-subrepo/test/push-no-changes.t

@@ -12,14 +12,14 @@ clone-foo-and-bar
 
 {
   is "$(
-    cd $OWNER/bar
-    git subrepo --quiet clone ../../../$UPSTREAM/foo
+    cd "$OWNER/bar"
+    git subrepo --quiet clone "$UPSTREAM/foo"
     catch git subrepo push foo
   )" \
     "Subrepo 'foo' has no new commits to push." \
     "Output OK: Check that 'push' requires changes to push"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git subrepo --quiet clean foo
   )
 }

data/vendor/git-subrepo/test/push-squash.t

@@ -11,10 +11,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a series of commits:
   add-new-files bar/FooBar1
@@ -26,19 +26,19 @@ clone-foo-and-bar
 
 # Do the subrepo push and test the output:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --squash
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 

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

@@ -13,10 +13,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a series of commits:
   add-new-files bar/FooBar
@@ -27,37 +27,37 @@ clone-foo-and-bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files bargy
   git push
 ) &> /dev/null || die
 
 # Do the subrepo push and test the output:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git config user.name 'PushUser'
     git config user.email 'push@push'
     git subrepo pull --quiet bar
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
 {
-  pullCommit="$(
-    cd $OWNER/bar
+  pullCommit=$(
+    cd "$OWNER/bar"
     git log HEAD -1 --pretty='format:%an %ae %cn %ce'
-  )"
+  )
 
   is "$pullCommit" \
     "PushUser push@push PushUser push@push" \
@@ -65,10 +65,10 @@ clone-foo-and-bar
 }
 
 {
-  subrepoCommit="$(
-    cd $OWNER/bar
+  subrepoCommit=$(
+    cd "$OWNER/bar"
     git log HEAD^ -1 --pretty='format:%an %ae %cn %ce'
-  )"
+  )
 
   is "$subrepoCommit" \
     "FooUser foo@foo PushUser push@push" \
@@ -79,39 +79,40 @@ clone-foo-and-bar
 test-commit-count "$OWNER/bar" HEAD 7
 
 # Test foo/bar/.gitrepo file contents:
+# 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)"
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  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)"
 }
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar2
   modify-files bar/FooBar
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 # Pull the changes from UPSTREAM/bar in OWNER/bar
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -124,7 +125,7 @@ test-exists \
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar3
   modify-files bar/FooBar
   git subrepo push bar
@@ -133,20 +134,20 @@ test-exists \
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'Seqential pushes are correct'
 }
 
 (
   # In the subrepo
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
   add-new-files barBar2
   git push
@@ -154,16 +155,16 @@ test-exists \
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar5
   modify-files bar/FooBar3
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar 2>&1 || true
-  )"
+  )
 
   # Test the output:
   is "$message" \

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

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+# Setup foo with 2 branches, one before the subrepo
+# is added and one after so that we can rebase
+# thus destroying the parent in two ways. The first
+# destroys the second parent, but leave a reference to
+# a merge point. The second such that no history of
+# a merge point exists.
+
+clone-foo-and-bar
+
+(
+    cd "$OWNER/foo"
+    git switch -c branch1
+    add-new-files foo1
+    subrepo-clone-bar-into-foo
+    git branch branch2
+    add-new-files foo2
+) &> /dev/null || die
+
+(
+    cd "$OWNER/bar"
+    add-new-files bar2
+    git push
+) &> /dev/null || die
+
+(
+    cd "$OWNER/foo"
+    # Rebasing onto this merge point will still
+    # be able to find the merge point at branch1
+    git subrepo pull bar
+)
+
+(
+    cd "$OWNER/foo"
+    git switch branch2
+    add-new-files foo-branch2
+    git switch branch1
+    git rebase branch2
+) &> /dev/null || die
+
+# Force subrepo to search of the parent SHA,
+# validate it found the prevous merge point
+{
+    output=$(
+      cd "$OWNER/foo"
+      git subrepo clean --force --all
+      catch git subrepo branch bar
+    )
+
+    like "$output" "caused by a rebase" \
+      "subrepo detected merge point"
+}
+
+done_testing 1
+
+teardown