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

Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned

From
Jens Lehmann <jens.lehmann@web.de>
Date
Feb 17, 2011, 19:41 UTC
Message-ID
<4D5D7A06.6050700@web.de>
In-Reply-To
<1297959526-8089-1-git-send-email-olsonse@umich.edu>
Am 17.02.2011 17:18, schrieb Spencer E. Olson:
Show 5 quoted lines
> Previously, when a new submodule is cloned by running "git submodule update
> [--merge|--rebase]", the newly cloned submodule does not get checked out and a
> rebase or merge is incorrectly attempted against an empty working directory.
> This patch ignores --rebase or --merge for new submodules and instead simply
> checks out the appropriate revision.
Nice work, thanks!

Just a small thing: This problem also happens when the configuration "submodule.<name>.update" is set to either "rebase" or "merge", not only when using the command line options. So perhaps you could reword the topic to something like "submodule: don't merge or rebase when newly cloned" and adjust both commit messages a bit?

Apart from that:
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Previous: Jens LehmannNext: Junio C Hamano
Message 6 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.