From 80a14665b199a0ccacceb095e3a8bfc4f1e8645e Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Wed, 12 Jun 2013 02:12:59 +0200 Subject: finish_copy_notes_for_rewrite(): Let caller provide commit message When copying notes for a rewritten object, the resulting notes commit would have the following hardcoded commit message: Notes added by 'git notes copy' This is obviously bogus when the notes rewriting is performed by 'git commit --amend'. Therefore, let the caller specify an appropriate notes commit message instead of hardcoding it. The above message is used for 'git notes copy', but when calling finish_copy_notes_for_rewrite() from builtin/commit.c, we use the following message instead: Notes added by 'git commit --amend' Cc: Thomas Rast Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- builtin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin.h') diff --git a/builtin.h b/builtin.h index faef55913..78fb14db2 100644 --- a/builtin.h +++ b/builtin.h @@ -36,7 +36,7 @@ struct notes_rewrite_cfg { struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd); int copy_note_for_rewrite(struct notes_rewrite_cfg *c, const unsigned char *from_obj, const unsigned char *to_obj); -void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c); +void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg); extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size); -- cgit v1.2.1