diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
commit | 19b16a2cc6d67871d0a4298354eb446ada136a8e (patch) | |
tree | 01361b4995f97e26dfa6db56c685bc51a7f8b122 /tests.branching/morph-repository-stored-in-cloned-repositories.script | |
parent | 6eca890690217136a9685ca9ac55f6ea59882e9c (diff) | |
parent | eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff) | |
download | morph-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz |
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching/morph-repository-stored-in-cloned-repositories.script')
-rwxr-xr-x | tests.branching/morph-repository-stored-in-cloned-repositories.script | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script index 5f5efa9e..68edbad6 100755 --- a/tests.branching/morph-repository-stored-in-cloned-repositories.script +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script @@ -24,18 +24,18 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch echo "morph.repository in branch root repository:" -cd "$DATADIR/workspace/newbranch/baserock:morphs" +cd "$DATADIR/workspace/newbranch/test:morphs" git config morph.repository echo cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout baserock:morphs master +"$SRCDIR/scripts/test-morph" checkout test:morphs master echo "morph.repository in branch root repository of a checkout:" -cd "$DATADIR/workspace/master/baserock:morphs" +cd "$DATADIR/workspace/master/test:morphs" git config morph.repository echo @@ -43,5 +43,5 @@ cd "$DATADIR/workspace/master" "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello echo "morph.repository of an edited repository:" -cd "$DATADIR/workspace/master/baserock:hello" +cd "$DATADIR/workspace/master/test:hello" git config morph.repository |