Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint

diff --git a/delta-islands.h b/delta-islands.h
index b635cd07d8d80ea14b86e72da5dcaee1fb4ab11a..eb0f952629fc0a6cdcc113e19a04ddaa54bb32dd 100644 (file)
--- a/delta-islands.h
+++ b/delta-islands.h
@@ -1,14 +1,17 @@
 #ifndef DELTA_ISLANDS_H
 #define DELTA_ISLANDS_H
 
+struct commit;
 struct object_id;
 struct packing_data;
-struct commit;
+struct repository;
 
 int island_delta_cmp(const struct object_id *a, const struct object_id *b);
 int in_same_island(const struct object_id *, const struct object_id *);
-void resolve_tree_islands(int progress, struct packing_data *to_pack);
-void load_delta_islands(void);
+void resolve_tree_islands(struct repository *r,
+                         int progress,
+                         struct packing_data *to_pack);
+void load_delta_islands(struct repository *r, int progress);
 void propagate_island_marks(struct commit *commit);
 int compute_pack_layers(struct packing_data *to_pack);