summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch.script
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 14:46:35 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-29 18:49:31 +0100
commitb657fbcab062073ff4dd1c69a72b252e4992e152 (patch)
tree6739bceee440567f10aaead17974b5eeaa7e8fb6 /tests.branching/branch-creates-new-system-branch.script
parentce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93 (diff)
downloadmorph-b657fbcab062073ff4dd1c69a72b252e4992e152.tar.gz
Add mandatory repository parameter to "morph branch"
This is complementary to adding a repository parameter to the "morph checkout" command. It allows to branch off arbitrary repositories rather than always branching off baserock:morphs. All affected tests are updated to provide and work with this new parameter.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch.script')
-rwxr-xr-xtests.branching/branch-creates-new-system-branch.script6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script
index fa58796e..de1a81ee 100755
--- a/tests.branching/branch-creates-new-system-branch.script
+++ b/tests.branching/branch-creates-new-system-branch.script
@@ -21,15 +21,15 @@ set -eu
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch newbranch
+"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
echo "File tree:"
"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' |
sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,'
echo "Current branches:"
-"$SRCDIR/scripts/run-git-in" newbranch/morphs branch
+"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch
echo "Current origin:"
-"$SRCDIR/scripts/run-git-in" newbranch/morphs remote show origin |
+"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin |
sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g'