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

4
builtin/rebase.c
View File

@ -850,13 +850,13 @@ static int reset_head(struct object_id *oid, const char *action,
goto leave_reset_head;
}
if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {
if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
ret = error(_("failed to find tree of %s"),
oid_to_hex(&head_oid));
goto leave_reset_head;
}
if (!fill_tree_descriptor(&desc[nr++], oid)) {
if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
goto leave_reset_head;
}