diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
| commit | 19b16a2cc6d67871d0a4298354eb446ada136a8e (patch) | |
| tree | 01361b4995f97e26dfa6db56c685bc51a7f8b122 /tests.branching/branch-creates-new-system-branch-not-from-master.script | |
| parent | 6eca890690217136a9685ca9ac55f6ea59882e9c (diff) | |
| parent | eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff) | |
| download | morph-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz | |
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.script')
| -rwxr-xr-x | tests.branching/branch-creates-new-system-branch-not-from-master.script | 6 |
1 files changed, 3 insertions, 3 deletions
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 716dce8d..2ddc053a 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,7 +21,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch alfred +"$SRCDIR/scripts/test-morph" branch test:morphs newbranch alfred echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | @@ -29,8 +29,8 @@ echo "File tree:" grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch echo "Current origin:" -"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin | +"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin | sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' |