From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] import-tars: ignore the global PAX header
Date: Tue, 24 Mar 2020 14:35:55 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2003241433380.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200323232520.GE6499@camp.crustytoothpaste.net>
Hi brian,
On Mon, 23 Mar 2020, brian m. carlson wrote:
> On 2020-03-23 at 13:08:44, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > Git's own `git archive` inserts that header, but it often gets into the
> > way of `import-tars.perl` e.g. when a prefix was specified (for example
> > via `--prefix=my-project-1.0.0/`, or when downloading a `.tar.gz` from
> > GitHub releases): this prefix _should_ be stripped.
> >
> > Let's just skip it.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > Ignore the global PAX header in import-tars.perl
> >
> > This problem came up in Pacman-related work, where PKGBUILD definitions
> > would reference the tarballs downloaded from GitHub, and patches would
> > be applied on top. To work on those patches efficiently (e.g. when an
> > upgrade to a new version of the project no longer lets those patches
> > apply), I need to be able to import those tarballs into playground
> > worktrees and work on them. I like to use
> > contrib/fast-import/import-tars.perl for that purpose, but it really
> > needs to strip the prefix, otherwise it is too tedious to work with it.
> >
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-577%2Fdscho%2Fimport-tars-skip-pax-header-v1
> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-577/dscho/import-tars-skip-pax-header-v1
> > Pull-Request: https://github.com/gitgitgadget/git/pull/577
> >
> > contrib/fast-import/import-tars.perl | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
> > index e800d9f5c9c..d50ce26d5d9 100755
> > --- a/contrib/fast-import/import-tars.perl
> > +++ b/contrib/fast-import/import-tars.perl
> > @@ -139,6 +139,8 @@
> > print FI "\n";
> > }
> >
> > + next if ($typeflag eq 'g'); # ignore global header
> > +
>
> In general, it isn't safe to do this. A pax global header contains
> attributes that may live in a normal extended header at a lower
> priority. So it is valid, for example, to write an mtime field in the
> global header that applies to the entire archive and overrides the
> ustar header block (and is overridden by a normal extended header).
>
> I think we need a different solution for this case.
I agree that we need a different solution for this case.
At the same time, I would like to point out that I am trying to address a
_different_ problem than "we're not using the information contained within
the PAX global header": I want to prevent that header from polluting the
top-level tree.
For what it's worth, my patch does not prevent future patches from using
the information contained within the global header :-)
Thanks,
Dscho
next prev parent reply other threads:[~2020-03-24 13:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 13:08 [PATCH] import-tars: ignore the global PAX header Johannes Schindelin via GitGitGadget
2020-03-23 17:09 ` René Scharfe
2020-03-23 17:41 ` Junio C Hamano
2020-03-23 21:08 ` Johannes Schindelin
2020-03-23 21:50 ` Junio C Hamano
2020-03-23 21:05 ` Johannes Schindelin
2020-03-23 21:53 ` Junio C Hamano
2020-03-23 23:25 ` brian m. carlson
2020-03-24 13:35 ` Johannes Schindelin [this message]
2020-03-24 19:35 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2020-03-24 21:04 ` Junio C Hamano
2020-03-25 17:59 ` Johannes Schindelin
2020-03-25 18:43 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2003241433380.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=sandals@crustytoothpaste.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).