summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-05-03 14:51:11 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-05-04 14:24:07 +0100
commit581f76e2c0217c5f4c33652ce526bac65ce8ebed (patch)
tree86c6e652e3e44ce0720cd25435332211f123a0f6 /tests.branching
parent74773a6ba77719eb74103ca21b38393d5d608bb2 (diff)
downloadmorph-581f76e2c0217c5f4c33652ce526bac65ce8ebed.tar.gz
Make cmdtests set up repo-aliases and use prefixed reponames
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/setup5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests.branching/setup b/tests.branching/setup
index 261e7142..3b9b9381 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -28,7 +28,7 @@ set -eu
# Create a morph configuration file
cat <<EOF > "$DATADIR/morph.conf"
[config]
-git-base-url = file://$DATADIR/
+repo-alias = test=file://$DATADIR/#file://$DATADIR/
cachedir = $DATADIR/mine/.morph/cache
log = $DATADIR/morph.log
keep-path = true
@@ -61,7 +61,8 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.chunk"
"sources": [
{
"name": "hello",
- "ref": "master"
+ "ref": "master",
+ "repo": "test:hello"
}
]
}