summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 19:27:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-22 19:27:26 (GMT)
commitf35ccd9be2db9a55afd09ed1a9338c758fa63d82 (patch)
treec94f3c518cdadb2c478e066547f152d3c753fb36 /builtin/commit-tree.c
parent52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d (diff)
parent37576c14439a4dfa43bec5a5c953fea1cc436bbf (diff)
downloadgit-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.zip
git-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.tar.gz
git-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.tar.bz2
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
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index b9c3312..05353c3 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -98,7 +98,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
die_errno("git commit-tree: failed to read");
}
- if (commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
+ if (commit_tree(&buffer, tree_sha1, parents, commit_sha1, NULL)) {
strbuf_release(&buffer);
return 1;
}