{"thread":{"id":"37111","subject":"pitfall with empty commits during git rebase","startedAt":"2014-07-11T10:15:47Z","lastAt":"2014-07-11T18:25:31Z","messageCount":3,"participants":["Olaf Hering","Keller, Jacob E","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"245773","messageId":"20140711101547.GA26050@aepfle.de","threadId":"37111","inReplyTo":null,"subject":"pitfall with empty commits during git rebase","fromName":"Olaf Hering","fromEmail":"olaf@aepfle.de","sentAt":"2014-07-11T10:15:47Z","receivedAt":"2014-07-11T10:15:47Z","isPatch":false,"sender":{"key":"olaf@aepfle.de","avatar":"https://avatars.githubusercontent.com/u/942324?v=4"},"body":"\nThere is an incorrect message when doing \"git rebase -i remote/branch\".\nI have it only in german, see below. what happend is:\n\n#01 make changes on another host\n#02 copy patchfile to localhost\n#03 apply patchfile\n#04 git commit -avs # create commit#1\n#05 sleep 123456\n#06 make different changes on another host\n#07 copy patchfile to localhost\n#08 git show | patch -Rp1\n#09 git commit -avs # create commit#2\n#10 apply patchfile\n#11 git commit -avs # create commit#3\n#12 git rebase -i remote/branch\n     pick commit#1 msg\n     f    commit#2 msg\n     f    commit#3 msg\n\n....\n\".git/rebase-merge/git-rebase-todo\" 21L, 707C geschrieben\nSie fragten den jüngsten Commit nachzubessern, aber das würde diesen leer\nmachen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\nCommit mit \"git reset HEAD^\" vollständig entfernen.\nRebase im Gange; auf c105589\nSie sind gerade beim Rebase von Branch 'mybranch' auf 'c105589'.\n\nKeine Änderungen\n\nCould not apply 6c5842320acc797d395afb5cdf373c2bfaebfa34... revert\n....\n\nIts not clear what '--allow-empty' refers to, git rebase does not seem to\nunderstand this option.\n\nI should have skipped step #09 to avoid the trouble.\ngit version is 2.0.1. Please adjust the error msg above.\n\n\nOlaf\n"},{"id":"245807","messageId":"1405101528.22963.26.camel@jekeller-desk1.amr.corp.intel.com","threadId":"37111","inReplyTo":"20140711101547.GA26050@aepfle.de","subject":"Re: pitfall with empty commits during git rebase","fromName":"Keller, Jacob E","fromEmail":"jacob.e.keller@intel.com","sentAt":"2014-07-11T17:58:48Z","receivedAt":"2014-07-11T17:58:48Z","isPatch":false,"sender":{"key":"jacob.e.keller@intel.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"On Fri, 2014-07-11 at 12:15 +0200, Olaf Hering wrote:\n> There is an incorrect message when doing \"git rebase -i remote/branch\".\n> I have it only in german, see below. what happend is:\n> \n> #01 make changes on another host\n> #02 copy patchfile to localhost\n> #03 apply patchfile\n> #04 git commit -avs # create commit#1\n> #05 sleep 123456\n> #06 make different changes on another host\n> #07 copy patchfile to localhost\n> #08 git show | patch -Rp1\n> #09 git commit -avs # create commit#2\n> #10 apply patchfile\n> #11 git commit -avs # create commit#3\n> #12 git rebase -i remote/branch\n>      pick commit#1 msg\n>      f    commit#2 msg\n>      f    commit#3 msg\n> \n> ....\n> \".git/rebase-merge/git-rebase-todo\" 21L, 707C geschrieben\n> Sie fragten den jüngsten Commit nachzubessern, aber das würde diesen leer\n> machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n> Commit mit \"git reset HEAD^\" vollständig entfernen.\n> Rebase im Gange; auf c105589\n> Sie sind gerade beim Rebase von Branch 'mybranch' auf 'c105589'.\n> \n> Keine Änderungen\n> \n> Could not apply 6c5842320acc797d395afb5cdf373c2bfaebfa34... revert\n> ....\n> \n> Its not clear what '--allow-empty' refers to, git rebase does not seem to\n> understand this option.\n> \n\nYou should be able to fix this with\n\ngit commit --allow-empty\ngit rebase --continue\n\nBut yes the message could possibly be made a little clearer.\n\nThanks,\nJake\n\n> I should have skipped step #09 to avoid the trouble.\n> git version is 2.0.1. Please adjust the error msg above.\n> \n> \n> Olaf\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n\n\n"},{"id":"245813","messageId":"20140711182531.GG7856@sigill.intra.peff.net","threadId":"37111","inReplyTo":"20140711101547.GA26050@aepfle.de","subject":"Re: pitfall with empty commits during git rebase","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-07-11T18:25:31Z","receivedAt":"2014-07-11T18:25:31Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Jul 11, 2014 at 12:15:47PM +0200, Olaf Hering wrote:\n\n> Could not apply 6c5842320acc797d395afb5cdf373c2bfaebfa34... revert\n> ....\n> \n> Its not clear what '--allow-empty' refers to, git rebase does not seem to\n> understand this option.\n\nI think this is the same problem discussed recently in:\n\n  http://thread.gmane.org/gmane.comp.version-control.git/251365\n\n-Peff\n"}]}