mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Philippe Blain via GitGitGadget" <>
Cc: Jonathan Tan <>,
	Stefan Beller <>,
	Damien Robert <>,
	Philippe Blain <>,
	Philippe Blain <>
Subject: [PATCH 4/6] unpack-trees: remove outdated description for verify_clean_submodule
Date: Mon, 17 Feb 2020 04:53:04 +0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

From: Philippe Blain <>

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

Signed-off-by: Philippe Blain <>
 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,

  parent reply	other threads:[~2020-02-17  4:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17  4:53 [PATCH 0/6] unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodules Philippe Blain via GitGitGadget
2020-02-17  4:53 ` [PATCH 1/6] t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED Philippe Blain via GitGitGadget
2020-02-19 23:26   ` Junio C Hamano
2020-02-17  4:53 ` [PATCH 2/6] t/lib-submodule-update: remove outdated test description Philippe Blain via GitGitGadget
2020-02-17  4:53 ` [PATCH 3/6] t/lib-submodule-update: move a test to the right section Philippe Blain via GitGitGadget
2020-02-17  4:53 ` Philippe Blain via GitGitGadget [this message]
2020-02-17  4:53 ` [PATCH 5/6] unpack-trees: check for missing submodule directory in merged_entry Philippe Blain via GitGitGadget
2020-02-19 23:32   ` Junio C Hamano
2020-02-17  4:53 ` [PATCH 6/6] t/lib-submodule-update: add test removing nested submodules Philippe Blain via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).