summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch-not-from-master.script
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 15:51:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 18:53:48 +0000
commitb599757873d5f05e82647287dfd1387f2426e5c5 (patch)
tree45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.branching/branch-creates-new-system-branch-not-from-master.script
parent25067e0ff261577da0ace26126c01e2829d7e5b7 (diff)
downloadmorph-b599757873d5f05e82647287dfd1387f2426e5c5.tar.gz
tests: Use test: URL prefix instead of baserock: throughout
Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.script')
-rwxr-xr-xtests.branching/branch-creates-new-system-branch-not-from-master.script6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script
index 716dce8d..2ddc053a 100755
--- a/tests.branching/branch-creates-new-system-branch-not-from-master.script
+++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script
@@ -21,7 +21,7 @@ set -eu
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch alfred
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch alfred
echo "File tree:"
"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' |
@@ -29,8 +29,8 @@ echo "File tree:"
grep -v 'cache/gits/file_[^/]*/'
echo "Current branches:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch
echo "Current origin:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin |
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin |
sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g'