From b657fbcab062073ff4dd1c69a72b252e4992e152 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 29 Aug 2012 14:46:35 +0000 Subject: 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. --- .../branch-creates-new-system-branch-not-from-master.script | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.script') diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script index 9356a70f..e2883c83 100755 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.script +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script @@ -21,15 +21,15 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch newbranch origin/alfred +"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch origin/alfred echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/morphs remote show origin | +"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin | sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' -- cgit v1.2.1