| commit | d441111b62d6341a0a7faf9c80bbdea6f52286ef | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:40:52 +0000 (20 13:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:40:52 +0000 (20 13:40 -0800) | ||
| tree | ff7f1f6f618e92ae9fb8a7c8a93d12f0ac9e5297 | treesnapshot (tar.gz zip) |
| parent | 43e83c55ad43382d015c7b34fe7adeed1d25b149 | commitdiff |
| parent | 37576c14439a4dfa43bec5a5c953fea1cc436bbf | commitdiff |
Merge branch 'nd/war-on-nul-in-commit' into next
* 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
* 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