diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:26 -0800 |
| commit | f35ccd9be2db9a55afd09ed1a9338c758fa63d82 (patch) | |
| tree | c94f3c518cdadb2c478e066547f152d3c753fb36 /notes-merge.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.gz 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 'notes-merge.h')
| -rw-r--r-- | notes-merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.h b/notes-merge.h index 168a6724cd..0c11b173a1 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -37,7 +37,7 @@ void init_notes_merge_options(struct notes_merge_options *o); * The resulting commit SHA1 is stored in result_sha1. */ void create_notes_commit(struct notes_tree *t, struct commit_list *parents, - const char *msg, unsigned char *result_sha1); + const struct strbuf *msg, unsigned char *result_sha1); /* * Merge notes from o->remote_ref into o->local_ref |