diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 20:27:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 20:27:26 +0100 |
| commit | f35ccd9be2db9a55afd09ed1a9338c758fa63d82 (patch) | |
| tree | c94f3c518cdadb2c478e066547f152d3c753fb36 /commit.h | |
| parent | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' (diff) | |
| parent | commit_tree(): refuse commit messages that contain NULs (diff) | |
| download | git-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.tar.xz git-f35ccd9be2db9a55afd09ed1a9338c758fa63d82.zip | |
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 'commit.h')
| -rw-r--r-- | commit.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -191,11 +191,11 @@ struct commit_extra_header { extern void append_merge_tag_headers(struct commit_list *parents, struct commit_extra_header ***tail); -extern int commit_tree(const char *msg, unsigned char *tree, +extern int commit_tree(const struct strbuf *msg, unsigned char *tree, struct commit_list *parents, unsigned char *ret, const char *author); -extern int commit_tree_extended(const char *msg, unsigned char *tree, +extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree, struct commit_list *parents, unsigned char *ret, const char *author, struct commit_extra_header *); |