2.25.0: git rebase -i fails to --continue with staged data

2.25.0: git rebase -i fails to --continue with staged data

[Steffen Nurpmeso]

Hello.

  #?1|kent:xxx.git$ git alias|grep rema
  alias.rema rebase -i master
...
  #?0|kent:xxx.git$ git status
  interactive rebase in progress; onto 4a17872e
  Last commands done (39 commands done):
     e 6c7e85ef FIXME src/mx/gen-cmd-tab.h: regenerated
     e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated
    (see more in file .git/rebase-merge/done)
  Next commands to do (41 remaining commands):
     pick 31fb18fb FIXME NEWS: v14.9.17 ("To bind, or not to bind.."), 2020-02-01
     pick 763c0a26 [v15-compat] Make *v15-compat*=yes a default!
    (use "git rebase --edit-todo" to view and edit)
  You are currently editing a commit while rebasing branch 'notpushed' on '4a17872e'.
    (use "git commit --amend" to amend the current commit)
    (use "git rebase --continue" once you are satisfied with your changes)

  Changes to be committed:
    (use "git restore --staged <file>..." to unstage)
          modified:   src/mx/gen-okeys.h

  #?0|kent:xxx.git$ git rebase --continue
  error:
  You have uncommitted changes in your working tree. Please, commit them
  first and then run 'git rebase --continue' again.
  #?1|kent:xxx.git$

So i was "e"diting commit

     e 0314b1e7 FIXME src/mx/gen-okeys.h: regenerated

but cannot simply --continue here --- before 2.25.0 this would now
open the editor and then commit what i have into a.k.a. as the
commit we are editing.  So if i now "commit --amend" i will amend
the commit before the one i want, if i commit anything else
i introduce a new commit.

--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)

Re: 2.25.0: git rebase -i fails to --continue with staged data

[Steffen Nurpmeso]

Steffen Nurpmeso wrote in <20200201183619.tUTI7%steffen@sdaoden.eu>:

No.  Sorry for the noise, it was my fault, i reversed the todo
list, and therefore, after having committed something new that
_should_ have been placed in between two "e"dited changesets,
i was in fact after them, and git did correctly point out it had
no idea on what to do with staged data.
Sorry.

--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)