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/ambiguous-refs.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/ambiguous-refs.script')
| -rwxr-xr-x | tests.branching/ambiguous-refs.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 92b80d4a..9da776fd 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 |