From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jul 2017 20:32:57 +0000 (-0700)
Subject: Merge branch 'jt/unify-object-info'
X-Git-Tag: v2.14.0-rc0~35
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=00b7cf2379901394c971db5ab59ce70e12e434b7;p=git.git

Merge branch 'jt/unify-object-info'

Code clean-ups.

* jt/unify-object-info:
  sha1_file: refactor has_sha1_file_with_flags
  sha1_file: do not access pack if unneeded
  sha1_file: teach sha1_object_info_extended more flags
  sha1_file: refactor read_object
  sha1_file: move delta base cache code up
  sha1_file: rename LOOKUP_REPLACE_OBJECT
  sha1_file: rename LOOKUP_UNKNOWN_OBJECT
  sha1_file: teach packed_object_info about typename
---

00b7cf2379901394c971db5ab59ce70e12e434b7