summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-11-12 21:28:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-13 04:20:44 (GMT)
commiteb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 (patch)
tree9042f094bd1f12d1249d714fdd177fcbe4fbf2a4 /submodule.c
parent78a6766802ef32b82e6062e8e6ac5621894cc4a2 (diff)
downloadgit-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.zip
git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.gz
git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.bz2
Switch empty tree and blob lookups to use hash abstraction
Switch the uses of empty_tree_oid and empty_blob_oid to use the current_hash abstraction that represents the current hash algorithm in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 3ee4a0c..ec269a6 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;