Contents

#!/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

Version data entries

268 entries across 268 versions & 4 rubygems

Version	Path
eac_tools-0.86.5	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.86.4	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.86.3	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_git-0.16.0	vendor/git-subrepo/test/issue29.t
eac_tools-0.86.2	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_git-0.15.0	vendor/git-subrepo/test/issue29.t
eac_tools-0.84.2	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.84.1	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.84.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.83.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.82.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.81.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.80.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.79.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.78.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.77.1	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.77.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.76.1	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.76.0	sub/eac_git/vendor/git-subrepo/test/issue29.t
eac_tools-0.75.2	sub/eac_git/vendor/git-subrepo/test/issue29.t