Merge branch 'nd/war-on-nul-in-commit'

* nd/war-on-nul-in-commit:
commit_tree(): refuse commit messages that contain NULs
Convert commit_tree() to take strbuf as message
merge: abort if fails to commit

Conflicts:
builtin/commit.c
commit.c
commit.h