summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-13 21:28:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-13 21:28:54 (GMT)
commit721cc4314cb593e799213ad5f926a1e9fc5779b0 (patch)
treeffa71b39724a9eed8dc7c653cafb4e1211e7820d /diff-lib.c
parent95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff)
parentc250e02e2c6de8c116f4320a48ce44bbdb43015c (diff)
downloadgit-721cc4314cb593e799213ad5f926a1e9fc5779b0.zip
git-721cc4314cb593e799213ad5f926a1e9fc5779b0.tar.gz
git-721cc4314cb593e799213ad5f926a1e9fc5779b0.tar.bz2
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 'diff-lib.c')
-rw-r--r--diff-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 5173023..8104603 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -218,7 +218,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
} else if (revs->diffopt.ita_invisible_in_index &&
ce_intent_to_add(ce)) {
diff_addremove(&revs->diffopt, '+', ce->ce_mode,
- &empty_tree_oid, 0,
+ the_hash_algo->empty_tree, 0,
ce->name, 0);
continue;
}