Merge branch 'lt/apply' into next

* lt/apply:
Clean up sha1 file writing
Builtin git-cat-file
apply: force matching at the beginning.
Add a test-case for git-apply trying to add an ending line
apply: treat EOF as proper context.

diff --cc Makefile
Simple merge

diff --cc builtin-apply.c
Simple merge