Sync with maint

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index bad84a36e81dbebbad89bf66cb1411ebf27fe66a..899c1c5bbcb2e994a1462eb8048344b68d23767d 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -72,7 +72,7 @@ check_tar() {
                        for header in *.paxheader
                        do
                                data=${header%.paxheader}.data &&
-                               if test -h $data -o -e $data
+                               if test -h $data || test -e $data
                                then
                                        path=$(get_pax_header $header path) &&
                                        if test -n "$path"