diff options
| -rw-r--r-- | merge-ort.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8f14f1ad0b..d94e3f17d7 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 |