From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Thu, 9 May 2013 13:10:48 +0000 (+0200)
Subject: t5004: ignore pax global header file
X-Git-Tag: v1.8.2.3~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/abdb9b2e4fd7876ab7138119c4aedca70bc0d250?hp=e2161bc38514722050b3a9c50a7897c40b6a93cf

t5004: ignore pax global header file

Versions of tar that don't know pax headers -- like the ones in NetBSD 6
and OpenBSD 5.2 -- extract them as regular files.  Explicitly ignore the
file created for our global header when checking the list of extracted
files, as this is normal and harmless fall-back behaviour.  This fixes
test 3 of t5004 on these platforms.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index bfdb56a069..ddf6e35069 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -23,7 +23,7 @@ check_dir() {
 			echo "$dir/$i"
 		done
 	} | sort >expect &&
-	find "$dir" -print | sort >actual &&
+	find "$dir" ! -name pax_global_header -print | sort >actual &&
 	test_cmp expect actual
 }