diff options
author | Johan Herland <johan@herland.net> | 2013-06-12 02:12:59 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-12 10:27:41 -0700 |
commit | 80a14665b199a0ccacceb095e3a8bfc4f1e8645e (patch) | |
tree | 63c570d9e8e897e3c40406ed602f69b2ee1e7128 /builtin.h | |
parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
download | git-80a14665b199a0ccacceb095e3a8bfc4f1e8645e.tar.gz |
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 <trast@inf.ethz.ch>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
-rw-r--r-- | builtin.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |