From 154fca16eb20023bdaafc20cb15636c12a33efb1 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 14 Sep 2012 09:33:54 +0100 Subject: 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. --- .../branch-creates-new-system-branch-not-from-master.script | 5 +++-- 1 file changed, 3 insertions(+), 2 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 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 -- cgit v1.2.1