diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 21:30:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 21:30:21 +0300 |
commit | 1eb0a12ec3934b7fc398b118806fdf7550ae636e (patch) | |
tree | 7ffd8929d36f31040b31a92f45548154986e8fdf /builtin/rebase.c | |
parent | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (diff) | |
parent | 663d25018f11418ed888128e8b07b1cbe576712a (diff) |
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 'builtin/rebase.c')
-rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 89fc4b8153..95d34223e9 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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; } |