X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=sha1_file.c;h=ea6bd996b2953e876a02fcf972229c97cb7d590a;hb=23abd3f48cb217d1558fa1984bfa8c502717c08f;hp=751598786822950766668b4d1c97198b183586f7;hpb=276328ffb87cefdc515bee5f09916aea6e0244ed;p=git.git diff --git a/sha1_file.c b/sha1_file.c index 751598786..ea6bd996b 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1571,11 +1571,9 @@ static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset, struct delta_base_cache_entry *ent = delta_base_cache + hash; ret = ent->data; - if (ret && ent->p == p && ent->base_offset == base_offset) - goto found_cache_entry; - return unpack_entry(p, base_offset, type, base_size); + if (!ret || ent->p != p || ent->base_offset != base_offset) + return unpack_entry(p, base_offset, type, base_size); -found_cache_entry: if (!keep_cache) { ent->data = NULL; ent->lru.next->prev = ent->lru.prev;