diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-30 14:35:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-30 14:35:37 -0700 |
| commit | ad16f748f22c82d096664f15f1a1c7fcc361cfe3 (patch) | |
| tree | e3ea426b9f96290914bc4cf22da10b1c3e6a0ce1 /merge-recursive.c | |
| parent | Merge branch 'bs/asciidoctor-installation-hints' (diff) | |
| parent | tree.h API: simplify read_tree_recursive() signature (diff) | |
| download | tgif-ad16f748f22c82d096664f15f1a1c7fcc361cfe3.tar.xz | |
Merge branch 'ab/read-tree'
Code simplification by removing support for a caller that is long gone.
* ab/read-tree:
tree.h API: simplify read_tree_recursive() signature
tree.h API: expose read_tree_1() as read_tree_at()
archive: stop passing "stage" through read_tree_recursive()
ls-files: refactor away read_tree()
ls-files: don't needlessly pass around stage variable
tree.c API: move read_tree() into builtin/ls-files.c
ls-files tests: add meaningful --with-tree tests
show tests: add test for "git show <tree>"
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b69e694d98..ed31f9496c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -453,7 +453,7 @@ static void unpack_trees_finish(struct merge_options *opt) static int save_files_dirs(const struct object_id *oid, struct strbuf *base, const char *path, - unsigned int mode, int stage, void *context) + unsigned int mode, void *context) { struct path_hashmap_entry *entry; int baselen = base->len; @@ -473,8 +473,8 @@ static void get_files_dirs(struct merge_options *opt, struct tree *tree) { struct pathspec match_all; memset(&match_all, 0, sizeof(match_all)); - read_tree_recursive(opt->repo, tree, "", 0, 0, - &match_all, save_files_dirs, opt); + read_tree(opt->repo, tree, + &match_all, save_files_dirs, opt); } static int get_tree_entry_if_blob(struct repository *r, |