diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 14:46:35 +0000 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-29 18:49:31 +0100 |
commit | b657fbcab062073ff4dd1c69a72b252e4992e152 (patch) | |
tree | 6739bceee440567f10aaead17974b5eeaa7e8fb6 /tests.branching/show-system-branch-fails-outside-workspace.script | |
parent | ce83a0afe0a51c9b8ab75e89d23f45c3ebf2be93 (diff) | |
download | morph-b657fbcab062073ff4dd1c69a72b252e4992e152.tar.gz |
Add mandatory repository parameter to "morph branch"
This is complementary to adding a repository parameter to the "morph
checkout" command. It allows to branch off arbitrary repositories
rather than always branching off baserock:morphs.
All affected tests are updated to provide and work with this new
parameter.
Diffstat (limited to 'tests.branching/show-system-branch-fails-outside-workspace.script')
-rwxr-xr-x | tests.branching/show-system-branch-fails-outside-workspace.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/show-system-branch-fails-outside-workspace.script b/tests.branching/show-system-branch-fails-outside-workspace.script index fc3f3db3..5cd3bb98 100755 --- a/tests.branching/show-system-branch-fails-outside-workspace.script +++ b/tests.branching/show-system-branch-fails-outside-workspace.script @@ -15,8 +15,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Check that 'morph show-system-branch' shows the name of the current system -# branch correctly. +# Check that 'morph show-system-branch' fails when being run +# outside a workspace. set -eu @@ -24,7 +24,7 @@ set -eu # Create a workspace and branch. cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch testbranch +"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch # Leave the workspace. cd .. |