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

[PATCH 4/6] unpack-trees: remove outdated description for verify_clean_submodule

From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
Date
Feb 17, 2020, 04:53 UTC
Message-ID
<bc7217f293a381226abdff89ba046814777a96a5.1581915186.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.555.git.1581915186.gitgitgadget@gmail.com>
From: Philippe Blain <levraiphilippeblain@gmail.com>

The function verify_clean_submodule() learned to verify if a submodule working tree is clean in a7bc845a9a (unpack-trees: check if we can perform the operation for submodules, 2017-03-14), but the commented description above it was not updated to reflect that, such that this description has been outdated since then.

Since Git has now learned to optionnally recursively check out submodules during a superproject checkout, remove this outdated description.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
 unpack-trees.c | 3 ---
 1 file changed, 3 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index da4d6d4ec01..37eca3ede8b 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1815,9 +1815,6 @@ static void invalidate_ce_path(const struct cache_entry *ce,
 /*
  * Check that checking out ce->sha1 in subdir ce->name is not
  * going to overwrite any working files.
- *
- * Currently, git does not checkout subprojects during a superproject
- * checkout, so it is not going to overwrite anything.
  */
 static int verify_clean_submodule(const char *old_sha1,
 				  const struct cache_entry *ce,
-- 
gitgitgadget
Previous: Philippe Blain via GitGitGadgetNext: Philippe Blain via GitGitGadget
Message 3 of 9 in “unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodules”
  1. 0/6 unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodulesPhilippe Blain via GitGitGadget, Feb 17, 2020
  2. 2/6 t/lib-submodule-update: remove outdated test descriptionPhilippe Blain via GitGitGadget, Feb 17, 2020
  3. 4/6 unpack-trees: remove outdated description for verify_clean_submodulePhilippe Blain via GitGitGadget, Feb 17, 2020
  4. 5/6 unpack-trees: check for missing submodule directory in merged_entryPhilippe Blain via GitGitGadget, Feb 17, 2020
  5. Junio C HamanoFeb 19, 2020
  6. 1/6 t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTEDPhilippe Blain via GitGitGadget, Feb 17, 2020
  7. Junio C HamanoFeb 19, 2020
  8. 3/6 t/lib-submodule-update: move a test to the right sectionPhilippe Blain via GitGitGadget, Feb 17, 2020
  9. 6/6 t/lib-submodule-update: add test removing nested submodulesPhilippe Blain via GitGitGadget, Feb 17, 2020

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.