Merge branch 'maint'

* maint:
  textconv: stop leaking file descriptors
  commit: --cleanup is a message option
  git count-objects: handle packs bigger than 4G
  t7102: make the test fail if one of its check fails
  Documentation: always respect core.worktree if set

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc diff.c
Simple merge