git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gabriel <g2p.code@gmail.com>
To: git@vger.kernel.org
Cc: Gabriel <g2p.code@gmail.com>
Subject: [PATCH] import-tars: properly import git-archive tarballs
Date: Wed, 17 Feb 2010 20:20:52 +0100	[thread overview]
Message-ID: <1266434452-14532-1-git-send-email-g2p.code@gmail.com> (raw)

git-archive adds a special entry to the archives it creates,
pax_global_header, containing the SHA1 of the exported commit.

import-tars.perl extracted it as a file, the top directory of
the archive became a subdirectory, and files moved with every
imported tarball.

Now import-tars correctly ignores the comment.

Signed-off-by: Gabriel <g2p.code@gmail.com>
---
 contrib/fast-import/import-tars.perl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 95438e1..a5170a1 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -108,6 +108,7 @@ foreach my $tar_file (@ARGV)
 			}
 		}
 		print FI "\n";
+		next if $typeflag eq 'g' && $name eq 'pax_global_header';
 
 		my $path;
 		if ($prefix) {
-- 
1.7.0.rc2.31.g618d1

             reply	other threads:[~2010-02-17 19:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-17 19:20 Gabriel [this message]
2010-02-18  9:40 ` [PATCH] import-tars: properly import git-archive tarballs Peter Krefting
2010-02-18 13:00 ` Gabriel
2010-02-18 13:24   ` [PATCH] import-tars: Make it possible to include the original commit ID Peter Krefting
2010-02-18 15:02     ` Gabriel
2010-02-19  8:12       ` Peter Krefting

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=1266434452-14532-1-git-send-email-g2p.code@gmail.com \
    --to=g2p.code@gmail.com \
    --cc=git@vger.kernel.org \
    /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).