mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <>
To: Orgad Shaneh <>,
	Johannes Schindelin <>,
	Brandon Williams <>,
	Heiko Voigt <>
Cc: git <>
Subject: Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified
Date: Thu, 2 Nov 2017 11:34:20 -0700
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh <> 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?

  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-02  8:30 Orgad Shaneh
2017-11-02 18:34 ` Stefan Beller [this message]
2017-11-02 21:45   ` Orgad Shaneh
2017-11-03 16:06 ` Johannes Schindelin
2017-11-03 16:20   ` Johannes Schindelin
2017-11-04 18:04     ` Orgad Shaneh
2017-11-05  7:30       ` Orgad Shaneh
2017-11-06 18:37         ` Brandon Williams
2017-11-06 20:36           ` Orgad Shaneh

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:
       or Tor2web:

AGPL code for this site: git clone public-inbox