merge-recursive: check for directory level conflicts
[git/git-svn.git] / sha1-array.h
blob04b0756334da7adf1e3eefb3f521f8c95d263046
1 #ifndef SHA1_ARRAY_H
2 #define SHA1_ARRAY_H
4 struct oid_array {
5 struct object_id *oid;
6 int nr;
7 int alloc;
8 int sorted;
9 };
11 #define OID_ARRAY_INIT { NULL, 0, 0, 0 }
13 void oid_array_append(struct oid_array *array, const struct object_id *oid);
14 int oid_array_lookup(struct oid_array *array, const struct object_id *oid);
15 void oid_array_clear(struct oid_array *array);
17 typedef int (*for_each_oid_fn)(const struct object_id *oid,
18 void *data);
19 int oid_array_for_each_unique(struct oid_array *array,
20 for_each_oid_fn fn,
21 void *data);
23 #endif /* SHA1_ARRAY_H */