From: Amisha Chhajed Date: Thu, 22 Jan 2026 17:15:23 GMT Subject: [RFC PATCH 2/2] Replacing calls of string_list_sort and string_list_remove_duplicates with the combined variant string_list_u. Message-ID: <20260122171523.94234-3-amishhhaaaa@gmail.com> In-Reply-To: <20260122171523.94234-1-amishhhaaaa@gmail.com> Signed-off-by: Amisha Chhajed --- builtin/clone.c | 3 +-- builtin/fast-export.c | 3 +-- builtin/pack-objects.c | 6 ++---- builtin/sparse-checkout.c | 6 ++---- help.c | 3 +-- notes.c | 3 +-- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index b19b302b06..f05364c268 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1136,8 +1136,7 @@ int cmd_clone(int argc, int val; /* remove duplicates */ - string_list_sort(&option_recurse_submodules); - string_list_remove_duplicates(&option_recurse_submodules, 0); + string_list_sort_u(&option_recurse_submodules, 0); /* * NEEDSWORK: In a multi-working-tree world, this needs to be diff --git a/builtin/fast-export.c b/builtin/fast-export.c index b90da5e616..0c5d2386d8 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -1118,8 +1118,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info) free(full_name); } - string_list_sort(&extra_refs); - string_list_remove_duplicates(&extra_refs, 0); + string_list_sort_u(&extra_refs, 0); } static void handle_tags_and_duplicates(struct string_list *extras) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ca44b7894f..649dab4ed0 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3849,10 +3849,8 @@ static void read_packs_list_from_stdin(struct rev_info *revs) strbuf_reset(&buf); } - string_list_sort(&include_packs); - string_list_remove_duplicates(&include_packs, 0); - string_list_sort(&exclude_packs); - string_list_remove_duplicates(&exclude_packs, 0); + string_list_sort_u(&include_packs, 0); + string_list_sort_u(&exclude_packs, 0); repo_for_each_pack(the_repository, p) { const char *pack_name = pack_basename(p); diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 15d51e60a8..25de7692c9 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -292,8 +292,7 @@ static void write_cone_to_file(FILE *fp, struct pattern_list *pl) string_list_insert(&sl, pe->pattern); } - string_list_sort(&sl); - string_list_remove_duplicates(&sl, 0); + string_list_sort_u(&sl, 0); fprintf(fp, "/*\n!/*/\n"); @@ -316,8 +315,7 @@ static void write_cone_to_file(FILE *fp, struct pattern_list *pl) strbuf_release(&parent_pattern); - string_list_sort(&sl); - string_list_remove_duplicates(&sl, 0); + string_list_sort_u(&sl, 0); for (i = 0; i < sl.nr; i++) { char *pattern = escaped_pattern(sl.items[i].string); diff --git a/help.c b/help.c index 20e114432d..2070095b6f 100644 --- a/help.c +++ b/help.c @@ -420,8 +420,7 @@ void list_cmds_by_config(struct string_list *list) if (repo_config_get_string_tmp(the_repository, "completion.commands", &cmd_list)) return; - string_list_sort(list); - string_list_remove_duplicates(list, 0); + string_list_sort_u(list, 0); while (*cmd_list) { struct strbuf sb = STRBUF_INIT; diff --git a/notes.c b/notes.c index 8e00fd8c47..090c48bbd5 100644 --- a/notes.c +++ b/notes.c @@ -921,8 +921,7 @@ int combine_notes_cat_sort_uniq(struct object_id *cur_oid, if (string_list_add_note_lines(&sort_uniq_list, new_oid)) goto out; string_list_remove_empty_items(&sort_uniq_list, 0); - string_list_sort(&sort_uniq_list); - string_list_remove_duplicates(&sort_uniq_list, 0); + string_list_sort_u(&sort_uniq_list, 0); /* create a new blob object from sort_uniq_list */ if (for_each_string_list(&sort_uniq_list, -- 2.51.0