{"thread":{"id":"52734","subject":"2.25.0: git rebase -i fails to --continue with staged data","startedAt":"2020-02-01T18:36:23Z","lastAt":"2020-02-01T18:59:41Z","messageCount":2,"participants":["Steffen Nurpmeso"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"390995","messageId":"20200201183619.tUTI7%steffen@sdaoden.eu","threadId":"52734","inReplyTo":null,"subject":"2.25.0: git rebase -i fails to --continue with staged data","fromName":"Steffen Nurpmeso","fromEmail":"steffen@sdaoden.eu","sentAt":"2020-02-01T18:36:19Z","receivedAt":"2020-02-01T18:36:23Z","isPatch":false,"sender":{"key":"steffen@sdaoden.eu","avatar":"https://gravatar.com/avatar/d49e696effa4b8f04abdee3c3567a1638260b8fa05df4f389a373db04fc8a1b3?d=mp&s=160"},"body":"Hello.\n\n  #?1|kent:xxx.git$ git alias|grep rema\n  alias.rema rebase -i master\n...\n  #?0|kent:xxx.git$ git status\n  interactive rebase in progress; onto 4a17872e\n  Last commands done (39 commands done):\n     e 6c7e85ef FIXME src/mx/gen-cmd-tab.h: regenerated\n     e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated\n    (see more in file .git/rebase-merge/done)\n  Next commands to do (41 remaining commands):\n     pick 31fb18fb FIXME NEWS: v14.9.17 (\"To bind, or not to bind..\"), 2020-02-01\n     pick 763c0a26 [v15-compat] Make *v15-compat*=yes a default!\n    (use \"git rebase --edit-todo\" to view and edit)\n  You are currently editing a commit while rebasing branch 'notpushed' on '4a17872e'.\n    (use \"git commit --amend\" to amend the current commit)\n    (use \"git rebase --continue\" once you are satisfied with your changes)\n\n  Changes to be committed:\n    (use \"git restore --staged <file>...\" to unstage)\n          modified:   src/mx/gen-okeys.h\n\n  #?0|kent:xxx.git$ git rebase --continue\n  error:\n  You have uncommitted changes in your working tree. Please, commit them\n  first and then run 'git rebase --continue' again.\n  #?1|kent:xxx.git$\n\nSo i was \"e\"diting commit\n\n     e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated\n\nbut cannot simply --continue here --- before 2.25.0 this would now\nopen the editor and then commit what i have into a.k.a. as the\ncommit we are editing.  So if i now \"commit --amend\" i will amend\nthe commit before the one i want, if i commit anything else\ni introduce a new commit.\n\n--steffen\n|\n|Der Kragenbaer,                The moon bear,\n|der holt sich munter           he cheerfully and one by one\n|einen nach dem anderen runter  wa.ks himself off\n|(By Robert Gernhardt)\n"},{"id":"390996","messageId":"20200201185938.ACP7-%steffen@sdaoden.eu","threadId":"52734","inReplyTo":"20200201183619.tUTI7%steffen@sdaoden.eu","subject":"Re: 2.25.0: git rebase -i fails to --continue with staged data","fromName":"Steffen Nurpmeso","fromEmail":"steffen@sdaoden.eu","sentAt":"2020-02-01T18:59:38Z","receivedAt":"2020-02-01T18:59:41Z","isPatch":false,"sender":{"key":"steffen@sdaoden.eu","avatar":"https://gravatar.com/avatar/d49e696effa4b8f04abdee3c3567a1638260b8fa05df4f389a373db04fc8a1b3?d=mp&s=160"},"body":"Steffen Nurpmeso wrote in <20200201183619.tUTI7%steffen@sdaoden.eu>:\n\nNo.  Sorry for the noise, it was my fault, i reversed the todo\nlist, and therefore, after having committed something new that\n_should_ have been placed in between two \"e\"dited changesets,\ni was in fact after them, and git did correctly point out it had\nno idea on what to do with staged data.\nSorry.\n\n--steffen\n|\n|Der Kragenbaer,                The moon bear,\n|der holt sich munter           he cheerfully and one by one\n|einen nach dem anderen runter  wa.ks himself off\n|(By Robert Gernhardt)\n"}]}