Merge branch 'lt/unitype'

* lt/unitype:
builtin-prune.c: forgot TYPE => OBJ changes.
Remove TYPE_* constant macros and use object_type enums consistently.

diff --cc commit.c
Simple merge

diff --cc upload-pack.c
Simple merge