All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: John Keeping <john@keeping.me.uk>, git@vger.kernel.org
Subject: Re: [PATCH] rebase -i continue: Don't skip submodule only commits
Date: Wed, 11 Apr 2012 20:23:16 +0200	[thread overview]
Message-ID: <4F85CC14.6060106@web.de> (raw)
In-Reply-To: <7vpqbgtv4l.fsf@alter.siamese.dyndns.org>

Am 10.04.2012 00:09, schrieb Junio C Hamano:
> 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.

An obvious Ack from me and many thanks to John for providing the test
cases I didn't find the time to write!

      reply	other threads:[~2012-04-11 18:23 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
2012-04-11 18:23   ` Jens Lehmann [this message]

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=4F85CC14.6060106@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.