Merge branch 'ds/object-info-for-prefetch-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:14 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:14 +0000 (10:15 -0700)
Code cleanup and futureproof.

* ds/object-info-for-prefetch-fix:
sha1-file: split OBJECT_INFO_FOR_PREFETCH

1  2 
object-store.h
sha1-file.c
diff --cc object-store.h
Simple merge
diff --cc sha1-file.c
Simple merge