git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

From
Orgad Shaneh <orgads@gmail.com>
Date
Nov 2, 2017, 08:30 UTC
Message-ID
<CAGHpTBJTm=3f_VCnNLeE=V4CwvC6dM8qCmGRPDap6rszcpb65A@mail.gmail.com>
I can't reproduce this with a minimal example, but it happens in my project.

What I tried to do for reproducing is: rm -rf super sub mkdir sub; cd sub; git init git commit --allow-empty -m 'Initial commit' mkdir ../super; cd ../super git init git submodule add ../sub touch foo; git add foo sub git commit -m 'Initial commit' touch a; git add a; git commit -m 'a' touch b; git add b; git commit -m 'b' cd sub; git commit --allow-empty -m 'New commit'; cd .. git rebase -i HEAD^^

Then drop a.

In my project I get: error: cannot rebase: You have unstaged changes.

This works fine with 2.14.3.
- Orgad
Next: Stefan Beller
Message 1 of 9 in “Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified”
  1. Orgad ShanehNov 2, 2017
  2. Stefan BellerNov 2, 2017
  3. Orgad ShanehNov 2, 2017
  4. Johannes SchindelinNov 3, 2017
  5. Johannes SchindelinNov 3, 2017
  6. Orgad ShanehNov 4, 2017
  7. Orgad ShanehNov 5, 2017
  8. Brandon WilliamsNov 6, 2017
  9. Orgad ShanehNov 6, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.