]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/sha1-file-remove-oi-skip-cached'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Jan 2020 23:07:30 +0000 (15:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jan 2020 23:07:30 +0000 (15:07 -0800)
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

1  2 
object-store.h

diff --cc object-store.h
Simple merge