diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 05:14:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 05:14:36 +0000 |
| commit | 09f61306ecfdf0e532c58460d8d868d50021e7db (patch) | |
| tree | b6f46cb23ce41cddcb6e1320d5c1c4bd5d69e899 /delta-islands.c | |
| parent | Adding debian version 1:2.43.0-1. (diff) | |
| download | git-09f61306ecfdf0e532c58460d8d868d50021e7db.tar.xz git-09f61306ecfdf0e532c58460d8d868d50021e7db.zip | |
Merging upstream version 1:2.45.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'delta-islands.c')
| -rw-r--r-- | delta-islands.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/delta-islands.c b/delta-islands.c index 5de5759..f7e0794 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,18 +1,13 @@ #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" #include "pack.h" #include "tree-walk.h" #include "diff.h" -#include "revision.h" -#include "list-objects.h" #include "progress.h" #include "refs.h" #include "khash.h" @@ -289,7 +284,7 @@ void resolve_tree_islands(struct repository *r, if (!tree || parse_tree(tree) < 0) die(_("bad tree object %s"), oid_to_hex(&ent->idx.oid)); - init_tree_desc(&desc, tree->buffer, tree->size); + init_tree_desc(&desc, &tree->object.oid, tree->buffer, tree->size); while (tree_entry(&desc, &entry)) { struct object *obj; |