Re: Issue with git rebase

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sep 14, 2010, 12:43 UTC
Message-ID: <AANLkTikA7WpyiZCq43+vdUBri5X9pi3odkfRYd4jMXwR@mail.gmail.com>
In-Reply-To: <AANLkTikUE1q-MrOsc3QOc1x0UHdLJn6nf7yGJZ=q_qqP@mail.gmail.com>

On Tue, Sep 14, 2010 at 12:39, Rob Aldred <raldred@gmail.com> wrote:

Show 17 quoted lines

> Hey, I have a problem with rebase which i suspect is not very common
> I'm trying to repair a commit where over 100,000 lines including a
> diff were commited to the commit message.
> I have followed the manual here: http://bit.ly/9uVReJ
> That produces an error when it reaches the bad commit, heres the output:
>
>    First, rewinding head to replay your work on top of it...
>    Applying: fixes #2791 - added page count back in
>    Applying: fixes #2399 - commenting out code for starting and
> restarting solr/sunspot on production sites
>    Applying: fixes #2361 - all selenium features now pass
>    Applying: fixes #2797 - fixed checkout footer
>    Applying: Implementing cartridge chooser wizard, Showing featured
> products on the homepage and improving the printer inks page
>     .......the rest of the massive 100000+ line commit message......
>    /usr/local/git/libexec/git-core/git-am: line 765:
> /usr/local/git/libexec/git-core/git: Argument list too long

What version of Git is this, and what does it have on git-am line 765?

How does it look under GIT_TRACE=1 ?

In cases like these you can extend the maximum argument list that the OS can take as a workaround.