From 8d4073d89ca66b2334e0e7d9fb08f6c73875ff7e Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 12 Oct 2012 17:16:35 +0100 Subject: morph status: Add initial version of command This provides a user-friendly summary of the workspace or branch status. --- tests.branching/status-in-dirty-branch.script | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 tests.branching/status-in-dirty-branch.script (limited to 'tests.branching/status-in-dirty-branch.script') diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script new file mode 100755 index 00000000..36ed781d --- /dev/null +++ b/tests.branching/status-in-dirty-branch.script @@ -0,0 +1,39 @@ +#!/bin/sh +# Copyright (C) 2011, 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. + + +# 'morph status' within a branch + +set -eu + +. "$SRCDIR/tests.branching/setup-3rd-party-strata" + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" branch baserock:morphs test + +# Make the branch have some interesting changes and pitfalls +cd test +"$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello + +cd baserock:stratum2-hello +git checkout -q master + +cd .. +mkdir red-herring +cd red-herring +git init -q . + +"$SRCDIR/scripts/test-morph" status -- cgit v1.2.1