From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org, Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH] rebase -i continue: Don't skip submodule only commits
Date: Mon, 09 Apr 2012 15:09:46 -0700 [thread overview]
Message-ID: <7vpqbgtv4l.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1333794053-22226-1-git-send-email-john@keeping.me.uk> (John Keeping's message of "Sat, 7 Apr 2012 11:20:53 +0100")
John Keeping <john@keeping.me.uk> writes:
> When git-rebase--interactive stops due to a conflict and the only change
> to be committed is in a submodule, the test for whether there is
> anything to be committed ignores the staged submodule change. This
> leads rebase to skip creating the commit for the change.
>
> While unstaged submodule changes should be ignored to avoid needing to
> update submodules during a rebase, it is safe to remove the
> --ignore-submodules option to diff-index because --cached ensures that
> it is only checking the index. This was discussed in [1] and a test is
> included to ensure that unstaged changes are still ignored correctly.
>
> [1] http://thread.gmane.org/gmane.comp.version-control.git/188713
>
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
Very well explained and sensible.
next prev parent reply other threads:[~2012-04-09 22:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-07 10:20 [PATCH] rebase -i continue: Don't skip submodule only commits John Keeping
2012-04-09 22:09 ` Junio C Hamano [this message]
2012-04-11 18:23 ` Jens Lehmann
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vpqbgtv4l.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
/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.
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 NNTP newsgroup(s).