From 724dd767b245db588840d7e9dbd46687ee84020b Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 17 Aug 2019 11:41:32 -0700 Subject: cache-tree: share code between functions writing an index as a tree write_tree_from_memory() appeared to be a merge-recursive special that basically duplicated write_index_as_tree(). The two have a different signature, but the bigger difference was just that write_index_as_tree() would always unconditionally read the index off of disk instead of working on the current in-memory index. So: * split out common code into write_index_as_tree_internal() * rename write_tree_from_memory() to write_inmemory_index_as_tree(), make it call write_index_as_tree_internal(), and move it to cache-tree.c Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.h | 1 - 1 file changed, 1 deletion(-) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 18012fff9d..0a3033bdb0 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -113,7 +113,6 @@ int merge_recursive_generic(struct merge_options *o, void init_merge_options(struct merge_options *o, struct repository *repo); -struct tree *write_tree_from_memory(struct merge_options *o); int parse_merge_opt(struct merge_options *out, const char *s); -- cgit v1.2.3