mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/tree-walk-with-repo'

Browse Source 
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()
This commit is contained in:
Junio C Hamano
2019-07-19 11:30:21 -07:00
parent d97c62c828 663d25018f
commit 1eb0a12ec3
26 changed files with 146 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/pack-objects.c
View File

@ -1428,7 +1428,8 @@ static void add_preferred_base(struct object_id *oid)
if (window <= num_preferred_base++)
return;
data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
data = read_object_with_reference(the_repository, oid,
tree_type, &size, &tree_oid);
if (!data)
return;