summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-06-27 09:28:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-27 19:45:17 (GMT)
commit5e575807337d15dbecf88767e709df08304e3b94 (patch)
treee74223df14c8a18469a7c9d86825c23fb1142152 /tree-walk.h
parentd3b4705ab81c01cb57dd356d96e981de78d65a5d (diff)
downloadgit-5e575807337d15dbecf88767e709df08304e3b94.zip
git-5e575807337d15dbecf88767e709df08304e3b94.tar.gz
git-5e575807337d15dbecf88767e709df08304e3b94.tar.bz2
tree-walk.c: remove the_repo from fill_tree_descriptor()
While at there, clean up the_repo usage in builtin/merge-tree.c a tiny bit. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/tree-walk.h b/tree-walk.h
index 161e240..9aa1042 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -45,7 +45,9 @@ int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long
int tree_entry(struct tree_desc *, struct name_entry *);
int tree_entry_gently(struct tree_desc *, struct name_entry *);
-void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
+void *fill_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const struct object_id *oid);
struct traverse_info;
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);