diff options
Diffstat (limited to 'delta-islands.c')
| -rw-r--r-- | delta-islands.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/delta-islands.c b/delta-islands.c index afdec0a878..5de5759f3f 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,8 +1,10 @@ -#include "cache.h" +#include "git-compat-util.h" #include "attr.h" #include "object.h" #include "blob.h" #include "commit.h" +#include "gettext.h" +#include "hex.h" #include "tag.h" #include "tree.h" #include "delta.h" @@ -338,7 +340,9 @@ static void free_remote_islands(kh_str_t *remote_islands) kh_destroy_str(remote_islands); } -static int island_config_callback(const char *k, const char *v, void *cb) +static int island_config_callback(const char *k, const char *v, + const struct config_context *ctx UNUSED, + void *cb) { struct island_load_data *ild = cb; @@ -506,8 +510,9 @@ void propagate_island_marks(struct commit *commit) struct commit_list *p; struct island_bitmap *root_marks = kh_value(island_marks, pos); - parse_commit(commit); - set_island_marks(&get_commit_tree(commit)->object, root_marks); + repo_parse_commit(the_repository, commit); + set_island_marks(&repo_get_commit_tree(the_repository, commit)->object, + root_marks); for (p = commit->parents; p; p = p->next) set_island_marks(&p->item->object, root_marks); } |