Sync with 1.7.12.3

diff --git a/sha1-array.c b/sha1-array.c
index b2f47f98fbba26ff7cab4c8651f4c4097e933f84..6f4a2246c9a912d06cf1a6995e07bf2008ec749d 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -14,7 +14,7 @@ static int void_hashcmp(const void *a, const void *b)
        return hashcmp(a, b);
 }
 
-void sha1_array_sort(struct sha1_array *array)
+static void sha1_array_sort(struct sha1_array *array)
 {
        qsort(array->sha1, array->nr, sizeof(*array->sha1), void_hashcmp);
        array->sorted = 1;