summaryrefslogtreecommitdiff
path: root/tests.branching/checkout-existing-branch.script
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-14 09:33:54 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-14 17:25:29 +0100
commit154fca16eb20023bdaafc20cb15636c12a33efb1 (patch)
treecf7daf2daa7bd853ff0c721c7360b00e4f2fd975 /tests.branching/checkout-existing-branch.script
parente95f04846f5ecc82ce0c7e638756059442de8d23 (diff)
downloadmorph-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/checkout-existing-branch.script')
-rwxr-xr-xtests.branching/checkout-existing-branch.script3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script
index e7e3a379..0edf0222 100755
--- a/tests.branching/checkout-existing-branch.script
+++ b/tests.branching/checkout-existing-branch.script
@@ -27,7 +27,8 @@ cd "$DATADIR/workspace"
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" master/baserock:morphs branch