summaryrefslogtreecommitdiff
path: root/tests.branching/ambiguous-refs.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/ambiguous-refs.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/ambiguous-refs.script')
-rwxr-xr-xtests.branching/ambiguous-refs.script6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 3321a310..59d11fff 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -37,13 +37,13 @@ git commit --quiet -am "Rename hello-system"
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs release
+"$SRCDIR/scripts/test-morph" branch test:morphs release
# Create an extra ref to confuse any users of git show-ref
-cd release/baserock:morphs
+cd release/test:morphs
git checkout --quiet -b alpha/master HEAD~1
git checkout --quiet release
# The petrify will fail if we resolved 'master' as 'alpha/master' by mistake.
-cd "$DATADIR/workspace/release/baserock:morphs"
+cd "$DATADIR/workspace/release/test:morphs"
"$SRCDIR/scripts/test-morph" petrify