Patchwork test-subrepo-git: ignore pax_global_header when listing archive

login
register
mail settings
Submitter Pierre-Yves David
Date May 7, 2015, 11:51 p.m.
Message ID <e599c008a759b0ce99fd.1431042706@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/8962/
State Accepted
Headers show

Comments

Pierre-Yves David - May 7, 2015, 11:51 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1431042238 25200
#      Thu May 07 16:43:58 2015 -0700
# Node ID e599c008a759b0ce99fd376138a0daf70c76e229
# Parent  17ba4ccd20b48511b3d06ab47fb1b2faf31410d7
test-subrepo-git: ignore pax_global_header when listing archive

5115d03440f4 is adding a new tar call but forgot to filter out the
pax_global_header file that some tar versions write. This is similar to what
happened in 5dda6c708138.
Martin von Zweigbergk - May 8, 2015, 4:47 a.m.
I've pushed this to the clowncopter, thanks.

On Thu, May 7, 2015 at 4:52 PM Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1431042238 25200
> #      Thu May 07 16:43:58 2015 -0700
> # Node ID e599c008a759b0ce99fd376138a0daf70c76e229
> # Parent  17ba4ccd20b48511b3d06ab47fb1b2faf31410d7
> test-subrepo-git: ignore pax_global_header when listing archive
>
> 5115d03440f4 is adding a new tar call but forgot to filter out the
> pax_global_header file that some tar versions write. This is similar to
> what
> happened in 5dda6c708138.
>
> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -324,11 +324,11 @@ archive subrepos
>    ../archive_x/a
>    ../archive_x/s
>    ../archive_x/s/g
>
>    $ hg -R ../tc archive -S ../archive.tgz --prefix '.' 2>/dev/null
> -  $ tar -tzf ../archive.tgz | sort
> +  $ tar -tzf ../archive.tgz | sort | grep -v pax_global_header
>    .hg_archival.txt
>    .hgsub
>    .hgsubstate
>    a
>    s/g
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -324,11 +324,11 @@  archive subrepos
   ../archive_x/a
   ../archive_x/s
   ../archive_x/s/g
 
   $ hg -R ../tc archive -S ../archive.tgz --prefix '.' 2>/dev/null
-  $ tar -tzf ../archive.tgz | sort
+  $ tar -tzf ../archive.tgz | sort | grep -v pax_global_header
   .hg_archival.txt
   .hgsub
   .hgsubstate
   a
   s/g