![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Dec 2011 19:27:26 +0000 (11:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Dec 2011 19:27:26 +0000 (11:27 -0800) | ||
| commit | f35ccd9be2db9a55afd09ed1a9338c758fa63d82 | |
| tree | c94f3c518cdadb2c478e066547f152d3c753fb36 | tree | snapshot |
| parent | 52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d | commit | diff |
| parent | 37576c14439a4dfa43bec5a5c953fea1cc436bbf | commit | diff |
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
* 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
| builtin/commit-tree.c | diff1 | | diff2 | | blob | history |
| builtin/commit.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| builtin/notes.c | diff1 | | diff2 | | blob | history |
| commit.c | diff1 | | diff2 | | blob | history |
| commit.h | diff1 | | diff2 | | blob | history |
| notes-merge.c | diff1 | | diff2 | | blob | history |