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

gut submodule update and merge

From
Carl Fürstenberg <azatoth@gmail.com>
Date
Mar 17, 2011, 20:16 UTC
Message-ID
<AANLkTimneYSkr11yDt1eL5d-r6pJrt2EMLGEOBfOxOoD@mail.gmail.com>
Hello,

I've tried to setup in a n makefile a way to easy initialize and update submodules and at the same time keep eventual changes in the submodules. I though an "git submodule update --init --recursive --merge" would work, but this i notices created strange result if the submodules hadn't been checked out in the first place. the result then was that it marked in index all files to be deleted.

This behavior wasn't what I had in mind, and it resulted in I did following "fix" to resolve the issue (ugly): https://github.com/azatoth/jquery/commit/9977732a26820dd7f3ced2ce4554edadd62ae52c

Is this the intended behavior? logically I think an clean "git submodule update --init --merge" should not try to merge if there wasn't anything to begin with.

/Carl
Next: Carl Fürstenberg
Message 1 of 2 in “gut submodule update and merge”
  1. Carl FürstenbergMar 17, 2011
  2. Carl FürstenbergMar 18, 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.