diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 20:30:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 20:30:21 +0200 |
| commit | 1eb0a12ec3934b7fc398b118806fdf7550ae636e (patch) | |
| tree | 7ffd8929d36f31040b31a92f45548154986e8fdf /unpack-trees.c | |
| parent | Merge branch 'ra/cherry-pick-revert-skip' (diff) | |
| parent | t7814: do not generate same commits in different repos (diff) | |
| download | git-1eb0a12ec3934b7fc398b118806fdf7550ae636e.tar.xz git-1eb0a12ec3934b7fc398b118806fdf7550ae636e.zip | |
Merge branch 'nd/tree-walk-with-repo'
The tree-walk API learned to pass an in-core repository
instance throughout more codepaths.
* nd/tree-walk-with-repo:
t7814: do not generate same commits in different repos
Use the right 'struct repository' instead of the_repository
match-trees.c: remove the_repo from shift_tree*()
tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
tree-walk.c: remove the_repo from get_tree_entry()
tree-walk.c: remove the_repo from fill_tree_descriptor()
sha1-file.c: remove the_repo from read_object_with_reference()
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index dab713203e..62276d4fef 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -840,7 +840,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, const struct object_id *oid = NULL; if (dirmask & 1) oid = &names[i].oid; - buf[nr_buf++] = fill_tree_descriptor(t + i, oid); + buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid); } } |