fetch_pack(): update sought->nr to reflect number of unique entries

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 63d455ffef94a9be7b30ba86d4c4c1b7be60508e..6cd734a9cbf583b56488bc5828c68f8a3536b240 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -858,19 +858,6 @@ static struct ref *do_fetch_pack(int fd[2],
        return ref;
 }
 
-static int remove_duplicates(struct string_list *sought)
-{
-       int src, dst;
-
-       if (!sought->nr)
-               return 0;
-
-       for (src = dst = 1; src < sought->nr; src++)
-               if (strcmp(sought->items[src].string, sought->items[dst-1].string))
-                       sought->items[dst++] = sought->items[src];
-       return dst;
-}
-
 static int fetch_pack_config(const char *var, const char *value, void *cb)
 {
        if (strcmp(var, "fetch.unpacklimit") == 0) {
@@ -1090,7 +1077,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
 
        if (sought->nr) {
                sort_string_list(sought);
-               remove_duplicates(sought);
+               string_list_remove_duplicates(sought, 0);
        }
 
        if (!ref) {