Merge branch 'sb/submodule-unset-core-worktree-when-worktree-is-lost'

diff --git a/sha1-array.c b/sha1-array.c
index 265941fbf40d4a6c64bb1e77b2aef7a5950493a7..b94e0ec0f5e45fa56e1748bbb611a904ab81de67 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -69,7 +69,7 @@ int oid_array_for_each_unique(struct oid_array *array,
 
        for (i = 0; i < array->nr; i++) {
                int ret;
-               if (i > 0 && !oidcmp(array->oid + i, array->oid + i - 1))
+               if (i > 0 && oideq(array->oid + i, array->oid + i - 1))
                        continue;
                ret = fn(array->oid + i, data);
                if (ret)