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

From: Stefan Beller <sbeller@google.com>
Date: Nov 2, 2017, 18:34 UTC
Message-ID: <CAGZ79kZaCe6ATXajK_HhzhDcWm9CV3bsJ5EAqE5UYXBc+_b5yA@mail.gmail.com>
In-Reply-To: <CAGHpTBJTm=3f_VCnNLeE=V4CwvC6dM8qCmGRPDap6rszcpb65A@mail.gmail.com>

On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh <orgads@gmail.com> wrote:

Show 22 quoted lines

> 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?