From: Elijah Newren <newren@xxxxxxxxx>
In commit 4057523a40 ("submodule merge: update conflict error message",
2022-08-04), a more detailed message was provided when submodules
conflict, in order to help users know how to resolve those conflicts.
There were a couple situations for which a different message would be
more appropriate, but that commit left handling those for future work.
Unfortunately, that commit would check if any submodules were of the
type that it didn't know how to explain, and, if so, would avoid
providing the more detailed explanation even for the submodules it did
know how to explain.
Change this to have the code print the helpful messages for the subset
of submodules it knows how to explain.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-ort.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c
index 0a935a8135f..404f05e32d6 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4490,21 +4490,17 @@ static void print_submodule_conflict_suggestion(struct string_list *csub) {
if (!csub->nr)
return;
- /*
- * NEEDSWORK: The steps to resolve these errors deserve a more
- * detailed explanation than what is currently printed below.
- */
+ strbuf_add_separated_string_list(&subs, " ", csub);
for_each_string_list_item(item, csub) {
struct conflicted_submodule_item *util = item->util;
+ /*
+ * NEEDSWORK: The steps to resolve these errors deserve a more
+ * detailed explanation than what is currently printed below.
+ */
if (util->flag == CONFLICT_SUBMODULE_NOT_INITIALIZED ||
- util->flag == CONFLICT_SUBMODULE_HISTORY_NOT_AVAILABLE)
- return;
- }
-
- strbuf_add_separated_string_list(&subs, " ", csub);
- for_each_string_list_item(item, csub) {
- struct conflicted_submodule_item *util = item->util;
+ util->flag == CONFLICT_SUBMODULE_HISTORY_NOT_AVAILABLE)
+ continue;
/*
* TRANSLATORS: This is a line of advice to resolve a merge
--
gitgitgadget
