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

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

From
Orgad Shaneh <orgads@gmail.com>
Date
Nov 2, 2017, 21:45 UTC
Message-ID
<CAGHpTB+58ZeXxkprYegjA6w4Ar0sPc=_OUENuvn+_CBxLXOsNw@mail.gmail.com>
In-Reply-To
<CAGZ79kZaCe6ATXajK_HhzhDcWm9CV3bsJ5EAqE5UYXBc+_b5yA@mail.gmail.com>
On Thu, Nov 2, 2017 at 8:34 PM, Stefan Beller <sbeller@google.com> wrote:
Show 34 quoted lines
> On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh <orgads@gmail.com> wrote:
>> 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.
>
>   git log --oneline v2.14.3..v2.15.0 -- submodule.c
> doesn't give any promising hints (i.e. I don't think one of a
> submodule related series introduced this either by chance or
> on purpose)
>
> "rebase -i" was rewritten into C in 570676e011, though
> that series was extensively tested by DScho, so I wouldn't
> want to point fingers here quickly.
>
> Would you be willing to bisect this behavior?

Bisected to ff6f1f564c48def1f8e1852826bab58af5044b06: submodule-config: lazy-load a repository's .gitmodules file

- Orgad
Previous: Stefan BellerNext: Johannes Schindelin
Message 3 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.