diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-11 18:05:56 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-12 14:13:42 +0100 |
| commit | 4e37fdf5adbf4d25561b472b4089b6782c599f93 (patch) | |
| tree | 82182fee7bd6f56a91b392c12dfb5cede7b4455b /tests.branching | |
| parent | 6b63ab3036e869c92b3c5d6471e4856df3583019 (diff) | |
| download | morph-4e37fdf5adbf4d25561b472b4089b6782c599f93.tar.gz | |
Don't require .morph in triplet arguments
This gives us consistency with morphologies, where the triplets are
repo|ref|morphology, not repo|ref|filename
Anyone who runs 'morph build baserock:morphs master system.morph' will
now see an error ending with 'was looking for system.morph.morph', which
should make it clear where they have gone wrong.
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/petrify.script | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 502c8220..d6c380b2 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -23,10 +23,9 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" update-gits baserock:morphs master \ - hello-stratum.morph +"$SRCDIR/scripts/test-morph" update-gits baserock:morphs master hello-stratum "$SRCDIR/scripts/test-morph" checkout baserock:morphs master cd master/baserock:morphs -"$SRCDIR/scripts/test-morph" petrify hello-stratum.morph +"$SRCDIR/scripts/test-morph" petrify hello-stratum cat hello-stratum.morph |