From: Orgad Shaneh <orgads@gmail.com>
To: git <git@vger.kernel.org>
Subject: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified
Date: Thu, 2 Nov 2017 10:30:33 +0200 [thread overview]
Message-ID: <CAGHpTBJTm=3f_VCnNLeE=V4CwvC6dM8qCmGRPDap6rszcpb65A@mail.gmail.com> (raw)
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 reply other threads:[~2017-11-02 8:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 8:30 Orgad Shaneh [this message]
2017-11-02 18:34 ` Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified Stefan Beller
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 publicly 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGHpTBJTm=3f_VCnNLeE=V4CwvC6dM8qCmGRPDap6rszcpb65A@mail.gmail.com' \
--to=orgads@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).