path: root/merge-recursive.h
diff options
authorElijah Newren <>2019-08-17 18:41:32 (GMT)
committerJunio C Hamano <>2019-08-19 17:08:03 (GMT)
commit724dd767b245db588840d7e9dbd46687ee84020b (patch)
tree73b0cd4f0b2968f4261c8a0000c412a6fadcb323 /merge-recursive.h
parent345480d1ed462135d98e99cb5b5a426da27257c8 (diff)
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 <>
Diffstat (limited to 'merge-recursive.h')
1 files changed, 0 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 18012ff..0a3033b 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);