git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase -i continue: Don't skip submodule only commits

From
Jens Lehmann <jens.lehmann@web.de>
Date
Apr 11, 2012, 18:23 UTC
Message-ID
<4F85CC14.6060106@web.de>
In-Reply-To
<7vpqbgtv4l.fsf@alter.siamese.dyndns.org>
Am 10.04.2012 00:09, schrieb Junio C Hamano:
Show 19 quoted lines
> 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!

Previous: Junio C Hamano
Message 3 of 3 in “rebase -i continue: Don't skip submodule only commits”
  1. rebase -i continue: Don't skip submodule only commitsJohn Keeping, Apr 7, 2012
  2. Junio C HamanoApr 9, 2012
  3. Jens LehmannApr 11, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.