From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: git discussion list <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH 1/2] t5004: ignore pax global header file
Date: Thu, 09 May 2013 15:10:48 +0200 [thread overview]
Message-ID: <518BA058.6050300@lsrfire.ath.cx> (raw)
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>
---
Fixes a failure of a test added after v1.8.2.
t/t5004-archive-corner-cases.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index bfdb56a..ddf6e35 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
}
--
1.8.2.1
next reply other threads:[~2013-05-09 13:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 13:10 René Scharfe [this message]
2013-05-09 13:13 ` [PATCH 2/2] t5004: avoid using tar for checking emptiness of archive René Scharfe
2013-05-09 13:36 ` [PATCH 3/2] t5004: resurrect original empty tar archive test René Scharfe
2013-05-11 6:03 ` Jonathan Nieder
2013-05-09 18:21 ` [PATCH 2/2] t5004: avoid using tar for checking emptiness of archive Eric Sunshine
2013-05-09 19:12 ` René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=518BA058.6050300@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).