eac_git 0.1.0 → 0.3.3

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

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+git clone $UPSTREAM/init $OWNER/init &>/dev/null
+
+gitrepo=$OWNER/init/doc/.gitrepo
+
+# Test that the initial repo look ok:
+{
+  test-exists \
+    "$OWNER/init/.git/" \
+    "$OWNER/init/ReadMe" \
+    "$OWNER/init/doc/" \
+    "$OWNER/init/doc/init.swim" \
+    "!$gitrepo"
+}
+
+output="$(
+  cd "$OWNER/init"
+  git subrepo init doc
+)"
+
+is "$output" "Subrepo created from 'doc' (with no remote)." \
+  'Command output is correct'
+
+{
+  test-exists \
+    "$gitrepo"
+}
+
+# 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`"
+}
+
+rm -fr "$OWNER/init"
+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
+) >/dev/null
+
+test-gitrepo-field "remote" "git@github.com:user/repo"
+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`"
+
+done_testing
+
+teardown

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

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+# if [[ $1 == ReRun ]]; then
+#   set -x
+# else
+#   "$0" ReRun 2>&1 | tee log
+#   exit 0
+# fi
+
+cd "$TMP"
+
+# Make 3 new repos:
+(
+  mkdir share main1 main2
+  git init share
+  git init main1
+  git init main2
+) > /dev/null
+
+# Add an empty 'readme' to the share repo:
+(
+  cd share
+  echo '* text eol=lf' > .gitattributes
+  touch readme
+  git add readme .gitattributes
+  git commit -m "Initial share"
+  # To push into here later we must not have working copy on master branch:
+  git checkout -b temp
+) &> /dev/null
+
+# `subrepo clone` the share repo into main1:
+(
+  cd main1
+  touch main1
+  git add main1
+  git commit -m "Initial main1"
+  git subrepo clone ../share share -b master
+) > /dev/null
+
+# `subrepo clone` the share repo into main2:
+(
+  cd main2
+  touch main2
+  git add main2
+  git commit -m "Initial main2"
+  git subrepo clone ../share share -b master
+) > /dev/null
+
+
+# Make a change to the main1 subrepo and push it:
+msg_main1="main1 initial add to subrepo"
+( set -x
+  cd main1
+  echo "$msg_main1" >> share/readme
+  git add share/readme
+  git commit -m "$msg_main1"
+
+  git subrepo push share
+) &> /dev/null
+
+ok "`! git:branch-exists "subrepo-push/share"`" \
+  "The subrepo-push/share branch was deleted after push"
+
+# TODO Check the state of refs made
+
+# Pull in the subrepo changes from above into main2.
+# Make a local change to the main2 subrepo and push it:
+msg_main2="main2 initial add to subrepo"
+( set -x
+  cd main2
+  git subrepo pull share
+  echo "$msg_main2" >> share/readme
+  git add share/readme
+  git commit -m "$msg_main2"
+
+  git subrepo push share
+) &> /dev/null || die
+
+# Go back into main1 and pull the subrepo updates:
+( set -x
+  cd main1
+  git subrepo pull share
+) &> /dev/null || die
+
+# The readme file should have both changes:
+is "$(cat main1/share/readme)" \
+  "$msg_main1"$'\n'"$msg_main2" \
+  "The readme file in the share repo has both subrepo commits"
+
+done_testing
+
+teardown

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

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+{
+    cd "$TMP"
+
+    # Make two new repos
+    (
+        mkdir host sub
+        git init host
+        git init sub
+    ) > /dev/null
+
+    # Initialize host repo
+    (
+        cd host
+        touch host
+        git add host
+        git commit -m "host initial commit"
+    ) > /dev/null
+
+    # Initialize sub repo
+    (
+        cd sub
+        git init
+        touch subrepo
+        git add subrepo
+        git commit -m "subrepo initial commit"
+    ) > /dev/null
+
+    # Make sub a subrepo of host
+    (
+        cd host
+        git subrepo clone ../sub sub
+    ) > /dev/null
+
+    # Create a branch in host and make some changes in it
+    (
+        cd host
+        git checkout -b feature
+        touch feature
+        git add feature
+        git commit -m "feature added"
+        git checkout master
+    ) &> /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "direct change in sub" >> subrepo
+        git commit -a -m "direct change in sub"
+    ) > /dev/null
+
+    # pull subrepo changes
+    (
+        cd host
+        git subrepo pull sub
+    ) > /dev/null
+
+    # commit directly to subrepo
+    (
+        cd sub
+        echo "another direct change in sub" >> subrepo
+        git commit -a -m "another direct change in sub"
+    ) > /dev/null
+
+    # commit to host/sub
+    (
+        cd host
+        echo "change from host" >> sub/subrepo-host
+        git add sub/subrepo-host
+        git commit -m "change from host"
+    ) > /dev/null
+
+    # merge previously created feature branch
+    (
+        cd host
+        git merge --no-ff --no-edit feature
+    ) > /dev/null
+
+    # pull subrepo changes
+    # expected: successful pull without conflicts
+    is "$(
+            cd host
+            git subrepo pull sub
+    )" \
+        "Subrepo 'sub' pulled from '../sub' (master)."
+
+}
+
+done_testing 1
+
+teardown

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

@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+    cd "$TMP"
+
+    # Make two new repos
+    (
+        mkdir host sub
+        git init host
+        git init sub
+    ) > /dev/null
+
+    # Initialize host repo
+    (
+        cd host
+        touch host
+        git add host
+        git commit -m "host initial commit"
+    ) > /dev/null
+
+    # Initialize sub repo
+    (
+        cd sub
+        git init
+        touch subrepo
+        git add subrepo
+        git commit -m "subrepo initial commit"
+    ) > /dev/null
+
+    # Make sub a subrepo of host
+    (
+        cd host
+        git subrepo clone ../sub sub
+    ) > /dev/null
+
+    # Commit some changes to the host repo
+    (
+        cd host
+        touch feature
+        git add feature
+        git commit -m "feature added"
+    ) &> /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "direct change in sub" >> subrepo
+        git commit -a -m "direct change in sub"
+    ) > /dev/null
+
+    # Pull subrepo changes
+    (
+        cd host
+        git subrepo pull sub
+    ) > /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "another direct change in sub" >> subrepo
+        git commit -a -m "another direct change in sub"
+        git checkout -b temp # otherwise push to master will fail
+    ) &> /dev/null
+
+    # Commit to host/sub
+    (
+        cd host
+        echo "change from host" >> sub/subrepo-host
+        git add sub/subrepo-host
+        git commit -m "change from host"
+    ) > /dev/null
+
+    # Pull subrepo changes
+    # expected: successful pull without conflicts
+    is "$(
+            cd host
+            git subrepo pull sub
+    )" \
+        "Subrepo 'sub' pulled from '../sub' (master)."
+
+    # Push subrepo changes
+    # expected: successful push without conflicts
+    is "$(
+            cd host
+            git subrepo push sub -b master -u
+    )" \
+       "Subrepo 'sub' pushed to '../sub' (master)."
+
+done_testing 2
+
+teardown

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

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+(
+  cd $OWNER/foo
+  git subrepo clone ../bar bar1
+  git subrepo clone ../bar bar2
+) &> /dev/null || die
+
+(
+  cd $OWNER/bar
+  modify-files Bar
+) &> /dev/null || die
+
+(
+  cd $OWNER/foo
+  git subrepo pull --all
+) &> /dev/null || die
+
+{
+  is "$(cat $OWNER/foo/bar1/Bar)" \
+    "a new line" \
+    'bar1/Bar content correct'
+  is "$(cat $OWNER/foo/bar2/Bar)" \
+    "a new line" \
+    'bar2/Bar content correct'
+}
+
+done_testing
+
+teardown

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

@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+subrepo-clone-bar-into-foo
+
+note "Pull - Conflict - Merge ours/theirs - Push"
+
+(
+  cd $OWNER/bar
+  add-new-files Bar2
+  git push
+) &> /dev/null || die
+
+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^)"
+  test-gitrepo-field "commit" "$bar_head_commit"
+  test-gitrepo-field "parent" "$foo_pull_commit"
+}
+
+foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD)"
+
+(
+  cd $OWNER/foo
+  git subrepo pull bar
+  modify-files-ex bar/Bar2
+  git push
+) &> /dev/null || die
+
+(
+  cd $OWNER/bar
+  modify-files-ex Bar2
+  git push
+) &> /dev/null || die
+
+(
+  cd $OWNER/foo
+  git subrepo pull bar || {
+      cd .git/tmp/subrepo/bar
+      echo "Merged Bar2" > Bar2
+      git add Bar2
+      git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
+      cd ../../../..
+      git subrepo commit bar
+      git subrepo clean bar
+  }
+) &> /dev/null || die
+
+test-exists \
+  "$OWNER/foo/bar/Bar2" \
+  "$OWNER/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)"
+  like "$foo_new_commit_message" \
+      "git subrepo commit \(merge\) bar" \
+      "subrepo pull should have merge message"
+}
+
+# Test foo/bar/.gitrepo file contents:
+{
+  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
+  git subrepo push bar
+) &> /dev/null || die
+
+# Check commit messages
+{
+  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
+  git pull
+) &> /dev/null || die
+
+test-exists \
+  "$OWNER/foo/bar/Bar2" \
+  "$OWNER/bar/Bar2" \
+
+is "$(cat $OWNER/foo/bar/Bar2)" \
+  "Merged Bar2" \
+  "The readme file in the mainrepo is merged"
+
+is "$(cat $OWNER/bar/Bar2)" \
+  "Merged Bar2" \
+  "The readme file in the subrepo is merged"
+
+done_testing
+
+teardown