Merge branch 'maint'

* maint:
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &&

diff --cc object.c
Simple merge