Contents

#!/usr/bin/env bash

set -e

source test/setup

use Test::More

clone-foo-and-bar

subrepo-clone-bar-into-foo

(
  cd $OWNER/bar
  add-new-files Bar2
  git push
) &> /dev/null || die

(
  cd $OWNER/foo
  add-new-files bar/Foo1
  git subrepo push bar --force
) &> /dev/null || die

(
  cd $OWNER/foo
  git subrepo pull bar
) &> /dev/null || die

test-exists \
  "$OWNER/foo/bar/Foo1" \
  !"$OWNER/foo/bar/Bar2" \

# Pull here will actually merge the old master with the new one
(
  set +x
  cd $OWNER/bar
  git pull
) &> /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
) &> /dev/null || die

test-exists \
  "$OWNER/newbar/Foo1" \
  !"$OWNER/foo/bar/Bar2" \

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/push-force.t
eac_tools-0.86.4	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.86.3	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_git-0.16.0	vendor/git-subrepo/test/push-force.t
eac_tools-0.86.2	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_git-0.15.0	vendor/git-subrepo/test/push-force.t
eac_tools-0.84.2	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.84.1	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.84.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.83.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.82.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.81.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.80.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.79.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.78.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.77.1	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.77.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.76.1	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.76.0	sub/eac_git/vendor/git-subrepo/test/push-force.t
eac_tools-0.75.2	sub/eac_git/vendor/git-subrepo/test/push-force.t