Merge branch 'jc/object-read-stream-fix' into ps/read-object-info-improvements

* jc/object-read-stream-fix:
  odb: do not use "blank" substitute for NULL

diff --cc object-file.c
Simple merge

diff --cc odb.c
Simple merge

diff --cc packfile.c
Simple merge