commit f35ccd9be2db9a55afd09ed1a9338c758fa63d82
author Junio C Hamano <gitster@pobox.com> Thu Dec 22 11:27:26 2011 -0800
committer Junio C Hamano <gitster@pobox.com> Thu Dec 22 11:27:26 2011 -0800
tree c94f3c518cdadb2c478e066547f152d3c753fb36
parent 52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d
parent 37576c14439a4dfa43bec5a5c953fea1cc436bbf

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

builtin/commit.c

diff --git a/builtin/commit.c b/builtin/commit.c
index be1ab2e..3069041 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1492,7 +1492,7 @@
 		append_merge_tag_headers(parents, &tail);
 	}
 
-	if (commit_tree_extended(sb.buf, active_cache_tree->sha1, parents, sha1,
+	if (commit_tree_extended(&sb, active_cache_tree->sha1, parents, sha1,
 				 author_ident.buf, extra)) {
 		rollback_index_files();
 		die(_("failed to write commit object"));