From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 09 Apr 2012 22:09:46 GMT
Subject: Re: [PATCH] rebase -i continue: Don't skip submodule only commits
Message-ID: <7vpqbgtv4l.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1333794053-22226-1-git-send-email-john@keeping.me.uk>

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.