diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-19 11:16:30 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-09-25 12:50:21 +0000 |
| commit | a2468159c731dbcf26dbb6483bcf50b5a81bccd8 (patch) | |
| tree | 9bb86c81b10250d071fb90f5239f2c95f3593b63 /tests.as-root | |
| parent | 8a003f588136a9f8eda7df876ed6c059dd6658f4 (diff) | |
| download | morph-a2468159c731dbcf26dbb6483bcf50b5a81bccd8.tar.gz | |
B&M: refactor branch-from-image
This changes the interface of branch-from-image to only take 1 parameter,
the name of the new system branch, as the root repository is loaded from
the metadata.
This was also what the previous version of branch-from-image did, but
that silently ignored the parameter.
Given there are not many users of branch-from-image, I felt it was a
reasonable change.
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/branch-from-image-works.script | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script index 9f82f629..942301e8 100755 --- a/tests.as-root/branch-from-image-works.script +++ b/tests.as-root/branch-from-image-works.script @@ -48,8 +48,7 @@ git commit --quiet -m 'Make hello say goodbye' workspace="$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$workspace" cd "$workspace" -"$SRCDIR/scripts/test-morph" branch-from-image \ - test:morphs mybranch \ +"$SRCDIR/scripts/test-morph" branch-from-image mybranch \ --metadata-dir="$extracted/baserock" cd mybranch/test:morphs grep -qFe "$hello_chunk_commit" hello-stratum.morph |