Problems with unrecognized headers in git bundles

Hi,

creating bundles from some repositories seems to lead to bundles with incorrectly formatted headers, at least with git >= 1.7.2. When cloning from such bundles, git prints the following error/warning:

   $ git clone perl-clone.bundle perl-clone
   Cloning into 'perl-clone'...
   warning: unrecognized header: --work around mangled archname on...

This can be reproduced easily with git from any version >= 1.7.2 or from master, using the following steps:

   git clone git://perl5.git.perl.org/perl.git perl
   GIT_DIR=perl/.git git bundle create perl-clone.bundle --all
   git clone perl-clone.bundle perl-clone

The content of the bundle is:

   # v2 git bundle
   -- work around mangled archname on win32 while finding...
   39ec54a59ce332fc44e553f4e5eeceef88e8369e refs/heads/blead
   39ec54a59ce332fc44e553f4e5eeceef88e8369e refs/remotes/origin/HEAD
   ...

The "--work around mangled archname..." line is rather long, so I've omitted most of it. What it contains is a series of commit messages all combined into a single line. It appears that this line is the problem because it's neither a comment (like '#v2 git bundle') nor a SHA1 followed by a ref name.

Note that this problem does not occur with all repositories. A bundle created from a test repository with a single text file and just one commit does not have this problem.

Note also that "git clone <bundle> <dest>" does not fail with corrupted bundles if the git version is something like 1.7.2 or 1.7.7.6. Those version print the above warning but still succeed in cloning. "git clone" from master however treats this as an error and fails.

Without any knowledge of how git works internally, I would assume that this is either a bug in how bundles are created, or a hint at a slightly broken perl repository (other's have the same thing though, perhaps it is because of a conversion from another SCM software to git in the past). Does this sound reasonable?

Is there a way to work around this or fix it properly? I'm not sure what lead to the decision to no longer ignore unrecognized headers in git master, would it be sensible to revert this change if nothing can be done to solve this during bundle creation?

   - Jannis

On 22 February 2012 17:05, Jannis Pohlmann wrote:

Have researched this a bit, and I've found that all git versions back to when git-bundle was introduced (around v1.5.4) produces the same invalid line. The culprit is commit 3e8148feadabd0d0b1869fcc4d218a6475a5b0bc in perl.git, branch 'maint-5.005'. The log message of that commit contains email headers, maybe that's the reason git bundle gets confused?

        Øyvind

On 22 February 2012 21:25, Øyvind A. Holm <sunny@sunbase.org> wrote:

...or maybe because the log message doesn't contain any empty lines, so they're joined together into an insanely long line. I've seen this behaviour before, in git-am or git-apply, I think. Anyway, when the bundle doesn't contain this commit, the line is not present.

  Øyvind

On Wed, Feb 22, 2012 at 9:25 PM, Øyvind A. Holm <sunny@sunbase.org> wrote:

For the lazy, the commit can be found here:

http://perl5.git.perl.org/perl.git/commit/3e8148feadabd0d0b1869fcc4d218a6475a5b0bc