diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:54 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:54 +0300 |
commit | 721cc4314cb593e799213ad5f926a1e9fc5779b0 (patch) | |
tree | ffa71b39724a9eed8dc7c653cafb4e1211e7820d /submodule.c | |
parent | 95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff) | |
parent | c250e02e2c6de8c116f4320a48ce44bbdb43015c (diff) |
Merge branch 'bc/hash-algo'
An infrastructure to define what hash function is used in Git is
introduced, and an effort to plumb that throughout various
codepaths has been started.
* bc/hash-algo:
repository: fix a sparse 'using integer as NULL pointer' warning
Switch empty tree and blob lookups to use hash abstraction
Integrate hash algorithm support with repo setup
Add structure representing hash algorithm
setup: expose enumerated repo info
Diffstat (limited to 'submodule.c')
-rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 95e6aff2bb..fa25888783 100644 --- 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; |