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

[WIP PATCH 0/4] Recursively checkout submodules

From
Jens Lehmann <jens.lehmann@web.de>
Date
Apr 9, 2010, 21:34 UTC
Message-ID
<4BBF9D6F.2000006@web.de>

Having found some Git time recently i started to tackle the next major issue on my agenda to improve submodule experience: Check out the matching versions of populated submodules when doing a checkout in the superproject (without having to do an explicit "git submodule update").

So here is what i came up with so far: The first two patches lay the groundwork by introducing a new function checkout_submodule() in submodule.c and calling it from checkout_entry(). The new "ignore_submodules" flags added to "struct checkout" and "struct unpack_trees_options" can be used to prevent that (and default to true, which is the old behavior then changed by the following patches). The next two patches teach "git checkout" and "git checkout-index" to default to checking out submodules too unless the new option "--ignore-subodules" is used.

What's working:
* Changing branches and specific revisions update the submodules
  accordingly
* "Revert changes" in "git gui" resets submodules now
What's missing:
* Test cases
* I think "git fetch" should recurse into populated submodules
  too, otherwise the commits to check out there might be missing
Opinions?
Jens Lehmann (4):
  Prepare checkout_entry() for recursive checkout of submodules
  Add "ignore_submodules" member to "struct unpack_trees_options"
  Teach checkout to recursively checkout submodules
  Teach checkout-index to recursively checkout submodules
 Documentation/git-checkout-index.txt |    9 ++++++++-
 Documentation/git-checkout.txt       |    7 +++++++
 archive.c                            |    1 +
 builtin/apply.c                      |    1 +
 builtin/checkout-index.c             |    5 ++++-
 builtin/checkout.c                   |    6 ++++++
 builtin/clone.c                      |    1 +
 builtin/commit.c                     |    1 +
 builtin/merge.c                      |    2 ++
 builtin/read-tree.c                  |    1 +
 builtin/reset.c                      |    1 +
 cache.h                              |    3 ++-
 diff-lib.c                           |    2 ++
 entry.c                              |    9 ++++++---
 merge-recursive.c                    |    1 +
 submodule.c                          |   32 ++++++++++++++++++++++++++++++++
 submodule.h                          |    1 +
 t/t2013-checkout-submodule.sh        |   14 ++++++++++++--
 unpack-trees.c                       |    1 +
 unpack-trees.h                       |    3 ++-
 20 files changed, 92 insertions(+), 9 deletions(-)
Next: Jens Lehmann
Message 1 of 13 in “Recursively checkout submodules”
  1. 0/4 Recursively checkout submodulesJens Lehmann, Apr 9, 2010
  2. 1/4 Prepare checkout_entry() for recursive checkout of submodulesJens Lehmann, Apr 9, 2010
  3. Junio C HamanoApr 9, 2010
  4. Jens LehmannApr 9, 2010
  5. Jens LehmannApr 10, 2010
  6. Junio C HamanoApr 10, 2010
  7. Jens LehmannApr 10, 2010
  8. 2/4 Add "ignore_submodules" member to "struct unpack_trees_options"Jens Lehmann, Apr 9, 2010
  9. 3/4 Teach checkout to recursively checkout submodulesJens Lehmann, Apr 9, 2010
  10. 4/4 Teach checkout-index to recursively checkout submodulesJens Lehmann, Apr 9, 2010
  11. Junio C HamanoApr 9, 2010
  12. Jens LehmannApr 9, 2010
  13. Junio C HamanoApr 10, 2010

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.