Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:27 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:27 +0000 (12:42 -0800)
commit9eddeaece19570d71e5012ecd0271369aaac8797
tree3cccab8be7f4c16a88030f8a478e682d523cfb76
parent3bba763373a5d0e5fcbe37a5f54a16f9b7f2e7b5
parent9c8a294a1ae1335511475db9c0eb8841c0ec9738
Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint

has_object_file() said "no" given an object registered to the
system via pretend_object_file(), making it inconsistent with
read_object_file(), causing lazy fetch to attempt fetching an
empty tree from promisor remotes.

* jt/sha1-file-remove-oi-skip-cached:
  sha1-file: remove OBJECT_INFO_SKIP_CACHED
object-store.h