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

[PATCH 06/10] submodule.c: sort changed_submodule_names before searching it

From
Stefan Beller <sbeller@google.com>
Date
Aug 8, 2018, 22:17 UTC
Message-ID
<20180808221752.195419-7-sbeller@google.com>
In-Reply-To
<20180808221752.195419-1-sbeller@google.com>

Instead of sorting it after we created an unsorted list, we could insert correctly into the list. As the unsorted append is in order of cache entry names, this is already sorted if names were equal to paths for submodules.

As submodule names are often the same as their path, the input is sorted pretty well already, so let's just do the sort afterwards.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 submodule.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/submodule.c b/submodule.c
index bceeba13217..89a46b8af50 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1255,7 +1255,7 @@ static int get_next_submodule(struct child_process *cp,
 		default:
 		case RECURSE_SUBMODULES_DEFAULT:
 		case RECURSE_SUBMODULES_ON_DEMAND:
-			if (!submodule || !unsorted_string_list_lookup(
+			if (!submodule || !string_list_lookup(
 					&changed_submodule_names,
 					submodule->name))
 				continue;
@@ -1349,6 +1349,7 @@ int fetch_populated_submodules(struct repository *r,
 	/* default value, "--submodule-prefix" and its value are added later */
 
 	calculate_changed_submodule_paths();
+	string_list_sort(&changed_submodule_names);
 	run_processes_parallel(max_parallel_jobs,
 			       get_next_submodule,
 			       fetch_start_failure,
-- 
2.18.0.597.ga71716f1ad-goog
Previous: Stefan BellerNext: Stefan Beller
Message 21 of 27 in “fetch: make sure submodule oids are fetched”
  1. 00/10 fetch: make sure submodule oids are fetchedStefan Beller, Aug 8, 2018
  2. 01/10 string_list: print_string_list to use trace_printfStefan Beller, Aug 8, 2018
  3. Junio C HamanoAug 9, 2018
  4. Stefan BellerAug 9, 2018
  5. 02/10 string-list.h: add string_list_pop function.Stefan Beller, Aug 8, 2018
  6. Martin ÅgrenAug 9, 2018
  7. Junio C HamanoAug 9, 2018
  8. Jeff KingAug 9, 2018
  9. Stefan BellerAug 9, 2018
  10. Jeff KingAug 9, 2018
  11. Stefan BellerAug 9, 2018
  12. 03/10 sha1-array: provide oid_array_remove_ifStefan Beller, Aug 8, 2018
  13. Martin ÅgrenAug 9, 2018
  14. Stefan BellerAug 9, 2018
  15. Jeff KingAug 9, 2018
  16. Junio C HamanoAug 9, 2018
  17. Junio C HamanoAug 9, 2018
  18. 04/10 submodule.c: convert submodule_move_head new argument to object idStefan Beller, Aug 8, 2018
  19. Junio C HamanoAug 9, 2018
  20. 05/10 submodule.c: fix indentationStefan Beller, Aug 8, 2018
  21. 06/10 submodule.c: sort changed_submodule_names before searching itStefan Beller, Aug 8, 2018
  22. 07/10 submodule: move global changed_submodule_names into fetch submodule structStefan Beller, Aug 8, 2018
  23. 08/10 submodule.c: do not copy around submodule listStefan Beller, Aug 8, 2018
  24. 09/10 submodule: fetch in submodules git directory instead of in worktreeStefan Beller, Aug 8, 2018
  25. 10/10 fetch: retry fetching submodules if sha1 were not fetchedStefan Beller, Aug 8, 2018
  26. Martin ÅgrenAug 9, 2018
  27. Stefan BellerAug 9, 2018

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.