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

Re: [PATCH 2/2 (v2)] t7406: "git submodule update {--merge|--rebase]" with new submodules

From
Jens Lehmann <jens.lehmann@web.de>
Date
Feb 17, 2011, 21:39 UTC
Message-ID
<4D5D95AF.6080106@web.de>
In-Reply-To
<7v4o82bekf.fsf@alter.siamese.dyndns.org>
Am 17.02.2011 21:18, schrieb Junio C Hamano:
Show 8 quoted lines
> Jens Lehmann <Jens.Lehmann@web.de> writes:
> 
>> This should be fixed to be able to detect regressions in the future, so
>> I came up with replacing the "git submodule status submodule" calls with
>> "git status -s submodule", which did the trick for me.
> 
> Hmph, is that a bug in "git submodule status" or is the subcommand
> deliberately designed to ignore this class of differences?

The latter, it doesn't care about working tree modifications inside of submodules as It uses the "--ignore-submodules=dirty" option when calling "git diff-files" (I added that in 18076502). The reason for one test to succeed and the other to fail is that the merge succeeds even though the work tree is empty while rebase errors out. So "git submodule status" is the wrong command to detect work tree differences, that's why we have to use "git status" here.

Previous: Junio C HamanoNext: Jens Lehmann
Message 5 of 11 in “submodule: no [--merge|--rebase] when newly cloned”
  1. 1/2 submodule: no [--merge|--rebase] when newly clonedSpencer E. Olson, Feb 17, 2011
  2. 2/2 t7406: "git submodule update {--merge|--rebase]" with new submodulesSpencer E. Olson, Feb 17, 2011
  3. Jens LehmannFeb 17, 2011
  4. Junio C HamanoFeb 17, 2011
  5. Jens LehmannFeb 17, 2011
  6. Jens LehmannFeb 17, 2011
  7. Junio C HamanoFeb 17, 2011
  8. Spencer E. OlsonFeb 17, 2011
  9. Junio C HamanoFeb 17, 2011
  10. Spencer E. OlsonFeb 17, 2011
  11. Junio C HamanoFeb 17, 2011

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.