diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-06 18:17:02 +0100 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-10 11:38:23 +0000 |
commit | 9b2df7beae03860c0b3fae3f84e44cc265e25b20 (patch) | |
tree | ab64ef123470389ff768d2a1d43326156443b439 /tests.branching | |
parent | 6075afa879da2eba9468b913332b41ff23a4e269 (diff) | |
download | morph-9b2df7beae03860c0b3fae3f84e44cc265e25b20.tar.gz |
morph branch: Fail if branch already exists in the system repo
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/branch-fails-if-branch-exists.script | 39 | ||||
-rw-r--r-- | tests.branching/branch-fails-if-branch-exists.stderr | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/tests.branching/branch-fails-if-branch-exists.script b/tests.branching/branch-fails-if-branch-exists.script new file mode 100755 index 00000000..c9a18633 --- /dev/null +++ b/tests.branching/branch-fails-if-branch-exists.script @@ -0,0 +1,39 @@ +#!/bin/sh +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Make sure "morph branch" fails if the system branch already exists in the +# branch root (morphologies repo). + +set -eu + +cd "$DATADIR/morphs" +git checkout --quiet -b baserock/existing-branch + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init + +# We create a valid branch inside the same prefix first so we can check it +# doesn't get caught up in the deletion of the invalid branch directory + +"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/new-branch + +[ -d "$DATADIR/workspace/baserock/new-branch" ] + +"$SRCDIR/scripts/test-morph" branch baserock:morphs \ + baserock/existing-branch || true + +[ -d "$DATADIR/workspace/baserock/new-branch" ] +[ ! -d "$DATADIR/workspace/baserock/existing-branch" ] diff --git a/tests.branching/branch-fails-if-branch-exists.stderr b/tests.branching/branch-fails-if-branch-exists.stderr new file mode 100644 index 00000000..c2ae2d9e --- /dev/null +++ b/tests.branching/branch-fails-if-branch-exists.stderr @@ -0,0 +1 @@ +ERROR: branch baserock/existing-branch already exists in repository baserock:morphs |