Merge branch 'maint'

* maint:
test-lib: fix broken printf
git apply --directory broken for new files

diff --cc builtin-apply.c
Simple merge

diff --cc t/test-lib.sh
Simple merge