On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Orgad, > > On Fri, 3 Nov 2017, Johannes Schindelin wrote: > >> On Thu, 2 Nov 2017, Orgad Shaneh wrote: >> >> > I can't reproduce this with a minimal example, but it happens in my >> > project. > > Whoa, I somehow overlooked the "can't". Sorry. > > I inserted a `git diff-files` here, and it printed exactly what I > expected: > > ++ git diff-files > :160000 160000 62cab94c8d8cf047bbb60c12def559339300efa4 > 0000000000000000000000000000000000000000 M sub > >> + git rebase -i HEAD^^ >> + ) >> +' > > There must be something else going wrong that we did not replicate here. > Maybe the `error: cannot rebase: You have unstaged changes.` message was > caused not by a change in the submodule? Could you run `git diff-files` > before the rebase?
It's the same before and during the rebase: $ git diff-files :160000 160000 c840225a7cf6bb2ec64da9d35d2c29210bc5e5e8 0000000000000000000000000000000000000000 M sub > > This does *not* refresh the index, but maybe that is what is going wrong; > you could call `git update-index --refresh` before the rebase and see > whether that works around the issue? Nope. If I run git submodule update, then rebase --continue works fine, so it's definitely somehow caused by the submodule. - Orgad
