mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/loose-object-cache-oid'

Browse Source 
Code clean-up.

* jk/loose-object-cache-oid:
  prefer "hash mismatch" to "sha1 mismatch"
  sha1-file: avoid "sha1 file" for generic use in messages
  sha1-file: prefer "loose object file" to "sha1 file" in messages
  sha1-file: drop has_sha1_file()
  convert has_sha1_file() callers to has_object_file()
  sha1-file: convert pass-through functions to object_id
  sha1-file: modernize loose header/stream functions
  sha1-file: modernize loose object file functions
  http: use struct object_id instead of bare sha1
  update comment references to sha1_object_info()
  sha1-file: fix outdated sha1 comment references
This commit is contained in:
Junio C Hamano
2019-02-06 22:05:27 -08:00
parent 96e6547c2e 01f8d5948a
commit cba595ab1a
22 changed files with 159 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache-tree.c
View File

@ -225,7 +225,7 @@ int cache_tree_fully_valid(struct cache_tree *it)
int i;
if (!it)
return 0;
if (it->entry_count < 0 || !has_sha1_file(it->oid.hash))
if (it->entry_count < 0 || !has_object_file(&it->oid))
return 0;
for (i = 0; i < it->subtree_nr; i++) {
if (!cache_tree_fully_valid(it->down[i]->cache_tree))
@ -253,7 +253,7 @@ static int update_one(struct cache_tree *it,
*skip_count = 0;
if (0 <= it->entry_count && has_sha1_file(it->oid.hash))
if (0 <= it->entry_count && has_object_file(&it->oid))
return it->entry_count;
/*