Merge branch 'ps/odb-clean-stale-wrappers' into next

Code clean-up.

* ps/odb-clean-stale-wrappers:
  odb: drop deprecated wrapper functions

diff --cc builtin/pack-objects.c
Simple merge

diff --cc odb.h
Simple merge

diff --cc pack-objects.c
index d8eb679735484a17196ba9d77ac6c8c7bfff2536,a9d9855063aea85f4b1b8f70f301c644c5d5e225..9d6ee72569ab3b8b8d7b4170728c46070e4fdd5c
--- 1/pack-objects.c
--- 2/pack-objects.c
+++ b/pack-objects.c
@@@ -4,6 -4,6 +4,7 @@@
  #include "pack-objects.h"
  #include "packfile.h"
  #include "parse.h"
++#include "repository.h"
  
  static uint32_t locate_object_entry_hash(struct packing_data *pdata,
                                         const struct object_id *oid,