{"thread":{"id":"25099","subject":"Issue with git rebase","startedAt":"2010-09-14T12:39:39Z","lastAt":"2010-09-14T13:10:06Z","messageCount":3,"participants":["Rob Aldred","Ævar Arnfjörð Bjarmason"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"150670","messageId":"AANLkTikUE1q-MrOsc3QOc1x0UHdLJn6nf7yGJZ=q_qqP@mail.gmail.com","threadId":"25099","inReplyTo":"AANLkTikWPkJ+8DJn5KZXfVw460HRY3Ui-xDZ_TR1X_Xg@mail.gmail.com","subject":"Issue with git rebase","fromName":"Rob Aldred","fromEmail":"raldred@gmail.com","sentAt":"2010-09-14T12:39:39Z","receivedAt":"2010-09-14T12:39:39Z","isPatch":false,"sender":{"key":"raldred@gmail.com","avatar":null},"body":"Hey, I have a problem with rebase which i suspect is not very common\nI'm trying to repair a commit where over 100,000 lines including a\ndiff were commited to the commit message.\nI have followed the manual here: http://bit.ly/9uVReJ\nThat produces an error when it reaches the bad commit, heres the output:\n\n    First, rewinding head to replay your work on top of it...\n    Applying: fixes #2791 - added page count back in\n    Applying: fixes #2399 - commenting out code for starting and\nrestarting solr/sunspot on production sites\n    Applying: fixes #2361 - all selenium features now pass\n    Applying: fixes #2797 - fixed checkout footer\n    Applying: Implementing cartridge chooser wizard, Showing featured\nproducts on the homepage and improving the printer inks page\n     .......the rest of the massive 100000+ line commit message......\n    /usr/local/git/libexec/git-core/git-am: line 765:\n/usr/local/git/libexec/git-core/git: Argument list too long\n\nThe other way I have tried is suggested on stack overflow and other places,\n`git rebase -i bad_commits_parent`\nSo i get the editor popup with the list of pick lines and commit\nmessages, it also includes the huge 100000 line message of the bad\ncommit\nso I remove the rubbish from the editor leaving the following:\n\n    pick 9ca499d fixes #2791 - added page count back in\n    pick 6554bab fixes #2399 - commenting out code for starting and\nrestarting solr/sunspot on production sites\n    pick fcd461a fixes #2361 - all selenium features now pass\n    pick abedb79 fixes #2797 - fixed checkout footer\n    pick 2860581 fixes #2757 Tidying up search results partial added\nin filtering feature for search added filter search controller\nrefactored filter helpers to help with testing added string method for\nfilter values\n    pick 010b596 Improving printer type and printer type category pages\n    reword e00b910 remove the full printer file we dont need it\n    pick 46d0831 Show the show the printer picker on printer type category pages\n    pick 7c0a850 - printer email now works like all other jobs - price\nband class should be called access via root from\nCartridgeSave::PriceBand\n    pick 96423bb - link to background jobs - add indexes to\nbackground_job_errors\n    pick aa5fba2 - tables are missing loads of indexes, so added a shed load\n    pick ee8d5e2 - index on status for orders, could get messy without\n    pick 2de051a remove js logging\n    pick 625243c fixes to specs for import mailer after rejig of jobs\n    pick cbaafa1 * Use 'homepage' tag instead of 'featured' for\nfeatured products on homepage.  * Show border around printer makes on\nprinter type pages  * Resized konica minolta image so it isn't so\nlarge\n    pick 2b1ea09 customer id index already exists on cards\n    pick d4d4d7a Fixing a couple of failing features\n    pick 6856c1e emails seem to be missing :format :html form urls, weird.\n    pick fbfb16b renaming TallyGenicom printer brand image\n    pick f02966a fixes #2757 - fixes problems with using pagination on\nthe filtering\n    # Rebase 6fe8075..f02966a onto 6fe8075\n    #\n    # Commands:\n    #  p, pick = use commit\n    #  r, reword = use commit, but edit the commit message\n    #  e, edit = use commit, but stop for amending\n    #  s, squash = use commit, but meld into previous commit\n    #  f, fixup = like \"squash\", but discard this commit's log message\n    #\n    # If you remove a line here THAT COMMIT WILL BE LOST.\n    # However, if you remove everything, the rebase will be aborted.\n\ni get the following out put:\nSuccessfully rebased and updated refs/heads/master.\n\nI'm left at the the parent of the bad commit anything newer including\nthe bad commit is gone.\nI can only assume something happened internally of git and it stopped\nat the bad commit.\nI'm about to resort to manually cherry picking all the recent commits\nand reapply everything manually.\n\nHope you can help.\n\nMany thanks\nRob\n"},{"id":"150671","messageId":"AANLkTikA7WpyiZCq43+vdUBri5X9pi3odkfRYd4jMXwR@mail.gmail.com","threadId":"25099","inReplyTo":"AANLkTikUE1q-MrOsc3QOc1x0UHdLJn6nf7yGJZ=q_qqP@mail.gmail.com","subject":"Re: Issue with git rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T12:43:48Z","receivedAt":"2010-09-14T12:43:48Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Sep 14, 2010 at 12:39, Rob Aldred <raldred@gmail.com> wrote:\n> Hey, I have a problem with rebase which i suspect is not very common\n> I'm trying to repair a commit where over 100,000 lines including a\n> diff were commited to the commit message.\n> I have followed the manual here: http://bit.ly/9uVReJ\n> That produces an error when it reaches the bad commit, heres the output:\n>\n>    First, rewinding head to replay your work on top of it...\n>    Applying: fixes #2791 - added page count back in\n>    Applying: fixes #2399 - commenting out code for starting and\n> restarting solr/sunspot on production sites\n>    Applying: fixes #2361 - all selenium features now pass\n>    Applying: fixes #2797 - fixed checkout footer\n>    Applying: Implementing cartridge chooser wizard, Showing featured\n> products on the homepage and improving the printer inks page\n>     .......the rest of the massive 100000+ line commit message......\n>    /usr/local/git/libexec/git-core/git-am: line 765:\n> /usr/local/git/libexec/git-core/git: Argument list too long\n\nWhat version of Git is this, and what does it have on git-am line 765?\n\nHow does it look under GIT_TRACE=1 ?\n\nIn cases like these you can extend the maximum argument list that the\nOS can take as a workaround.\n"},{"id":"150672","messageId":"AANLkTikVNUOC+ZfzsAJeSnxeXK_KzAnOuRPhVbmtZq2V@mail.gmail.com","threadId":"25099","inReplyTo":"AANLkTikA7WpyiZCq43+vdUBri5X9pi3odkfRYd4jMXwR@mail.gmail.com","subject":"Re: Issue with git rebase","fromName":"Rob Aldred","fromEmail":"raldred@gmail.com","sentAt":"2010-09-14T13:10:06Z","receivedAt":"2010-09-14T13:10:06Z","isPatch":false,"sender":{"key":"raldred@gmail.com","avatar":null},"body":"On 14 September 2010 13:43, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n>\n> What version of Git is this, and what does it have on git-am line 765?\n>\n> How does it look under GIT_TRACE=1 ?\n>\n> In cases like these you can extend the maximum argument list that the\n> OS can take as a workaround.\n>\n\nhey, rapid reply thanks.\ngit version 1.7.0.3 (Mac Snow Leopard) compiled by macports\nline 765 that errors is:\ngit update-ref -m \"$GIT_REFLOG_ACTION: $FIRSTLINE\" HEAD $commit $parent ||\n\nhmm it seems to have worked when running it with GIT_TRACE\nim sure thats didnt really fix it, very weird. it seems to have\ncompleted successfully\n\nThanks for your time.\n\n\n--\nRob\n"}]}