diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-05-09 15:10:48 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-09 12:18:57 -0700 |
| commit | abdb9b2e4fd7876ab7138119c4aedca70bc0d250 (patch) | |
| tree | 17267b503636fbf407658015d36a0937d2f36516 /merge-recursive.h | |
| parent | mergetools/kdiff3: do not use --auto when diffing (diff) | |
| download | tgif-abdb9b2e4fd7876ab7138119c4aedca70bc0d250.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions