Merge branch 'rs/fmt-merge-msg-string-leak-fix'

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 95e6aff2bb74e1374d22997d1918ed190c6edafc..fa25888783aa9ba7ce5b290ba64ec3c1b7a87cec 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -587,7 +587,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
                struct object_id *one, struct object_id *two,
                unsigned dirty_submodule)
 {
-       const struct object_id *old = &empty_tree_oid, *new = &empty_tree_oid;
+       const struct object_id *old = the_hash_algo->empty_tree, *new = the_hash_algo->empty_tree;
        struct commit *left = NULL, *right = NULL;
        struct commit_list *merge_bases = NULL;
        struct child_process cp = CHILD_PROCESS_INIT;