Merge branch 'jn/maint-c99-format'

* jn/maint-c99-format:
  unbreak and eliminate NO_C99_FORMAT
  mktag: avoid %td in format string

diff --cc Makefile
Simple merge

diff --cc builtin/mktag.c
Simple merge

diff --cc sha1_file.c
Simple merge