1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
|
#!/usr/bin/env bash
set -e
source test/setup
use Test::More
clone-foo-and-bar
(
cd "$OWNER/foo"
git subrepo clone ../bar bar
git worktree add -b test ../wt
) &> /dev/null || die
(
cd "$OWNER/bar"
modify-files Bar
) &> /dev/null || die
(
cd "$OWNER/wt"
git subrepo pull --all
) &> /dev/null || die
(
cd "$OWNER/foo"
git merge test
) &> /dev/null || die
{
is "$(cat "$OWNER/foo/bar/Bar")" \
"a new line" \
'bar/Bar content correct'
}
done_testing
teardown
|