diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 09:33:54 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 17:25:29 +0100 |
| commit | 154fca16eb20023bdaafc20cb15636c12a33efb1 (patch) | |
| tree | cf7daf2daa7bd853ff0c721c7360b00e4f2fd975 /tests.branching/branch-creates-new-system-branch-not-from-master.script | |
| parent | e95f04846f5ecc82ce0c7e638756059442de8d23 (diff) | |
| download | morph-154fca16eb20023bdaafc20cb15636c12a33efb1.tar.gz | |
Rework the blackbox tests for bare caches.
This reworks the blackbox tests to work with the bare repository caches. For
the most part it's slight changes to error messages and tweaks to ignore the
repository caches during file listing.
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 | 5 |
1 files changed, 3 insertions, 2 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 e2883c83..716dce8d 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,11 +21,12 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch origin/alfred +"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch alfred echo "File tree:" "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | + grep -v 'cache/gits/file_[^/]*/' echo "Current branches:" "$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch |