vfs: limit root_items branches to refs/heads

[bup.git] / t / test-cat-file.sh

diff --git a/t/test-cat-file.sh b/t/test-cat-file.sh
index f5638f09a463e30690c8b5fd413519afb64906bb..ec8610c905f00c5e589f27b9475bc1f0138cfcad 100755 (executable)
--- a/t/test-cat-file.sh
+++ b/t/test-cat-file.sh
@@ -1,21 +1,22 @@
 #!/usr/bin/env bash
-. ./wvtest-bup.sh
+. ./wvtest-bup.sh || exit $?
 
-set -eo pipefail
+set -o pipefail
+
+top="$(WVPASS pwd)" || exit $?
+tmpdir="$(WVPASS wvmktempdir)" || exit $?
 
-top="$(pwd)"
-tmpdir="$(wvmktempdir)"
 export BUP_DIR="$tmpdir/bup"
 export GIT_DIR="$tmpdir/bup"
 
 bup() { "$top/bup" "$@"; }
 
-bup init
-cd "$tmpdir"
+WVPASS bup init
+WVPASS cd "$tmpdir"
 
 WVSTART "cat-file"
-mkdir src
-date > src/foo
+WVPASS mkdir src
+WVPASS date > src/foo
 WVPASS bup index src
 WVPASS bup save -n src src
 WVPASS bup cat-file "src/latest/$(pwd)/src/foo" > cat-foo
@@ -24,16 +25,22 @@ WVPASS diff -u src/foo cat-foo
 WVSTART "cat-file --meta"
 WVPASS bup meta --create --no-paths src/foo > src-foo.meta
 WVPASS bup cat-file --meta "src/latest/$(pwd)/src/foo" > cat-foo.meta
-WVPASS diff -u \
-    <(bup meta -tvvf src-foo.meta | grep -vE '^atime: ') \
-    <(bup meta -tvvf cat-foo.meta | grep -vE '^atime: ')
+
+WVPASS bup meta -tvvf src-foo.meta | WVPASS grep -vE '^atime: ' > src-foo.list
+WVPASS bup meta -tvvf cat-foo.meta | WVPASS grep -vE '^atime: ' > cat-foo.list
+WVPASS diff -u src-foo.list cat-foo.list
 
 WVSTART "cat-file --bupm"
 WVPASS bup cat-file --bupm "src/latest/$(pwd)/src/" > bup-cat-bupm
-src_hash=$(bup ls -s "src/latest/$(pwd)" | cut -d' ' -f 1)
-bupm_hash=$(git ls-tree "$src_hash" | grep -F .bupm | cut -d' ' -f 3)
-bupm_hash=$(echo "$bupm_hash" | cut -d'        ' -f 1)
-git cat-file blob "$bupm_hash" > git-cat-bupm
-WVPASS cmp -b git-cat-bupm bup-cat-bupm
-
-rm -rf "$tmpdir"
+src_hash=$(WVPASS bup ls -s "src/latest/$(pwd)" | cut -d' ' -f 1) || exit $?
+bupm_hash=$(WVPASS git ls-tree "$src_hash" | grep -F .bupm | cut -d' ' -f 3) \
+    || exit $?
+bupm_hash=$(WVPASS echo "$bupm_hash" | cut -d' ' -f 1) || exit $?
+WVPASS "$top/t/git-cat-tree" "$bupm_hash" > git-cat-bupm
+if ! cmp git-cat-bupm bup-cat-bupm; then
+    cmp -l git-cat-bupm bup-cat-bupm
+    diff -uN <(bup meta -tvvf git-cat-bupm) <(bup meta -tvvf bup-cat-bupm)
+    WVPASS cmp git-cat-bupm bup-cat-bupm
+fi
+
+WVPASS rm -rf "$tmpdir"