setup_git_env: avoid blind fall-back to ".git"

diff --git a/sha1-array.c b/sha1-array.c
index 5b75a5a35d7bbf20c9f5794e27b4d6ed3d91954a..c1cc25cd95da66aec1c695f4bba9680f5cb834f6 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -14,9 +14,9 @@ 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);
+       QSORT(array->sha1, array->nr, void_hashcmp);
        array->sorted = 1;
 }
 
@@ -41,3 +41,23 @@ void sha1_array_clear(struct sha1_array *array)
        array->alloc = 0;
        array->sorted = 0;
 }
+
+int sha1_array_for_each_unique(struct sha1_array *array,
+                               for_each_sha1_fn fn,
+                               void *data)
+{
+       int i;
+
+       if (!array->sorted)
+               sha1_array_sort(array);
+
+       for (i = 0; i < array->nr; i++) {
+               int ret;
+               if (i > 0 && !hashcmp(array->sha1[i], array->sha1[i-1]))
+                       continue;
+               ret = fn(array->sha1[i], data);
+               if (ret)
+                       return ret;
+       }
+       return 0;
+}