From ed7a42a0752fd71cf04273b8e691966dd2c33ebe Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 8 Nov 2011 15:38:07 -0800 Subject: commit: teach --amend to carry forward extra headers After running "git pull $there for-linus" to merge a signed tag, the integrator may need to amend the resulting merge commit to fix typoes in it. Teach --amend option to read the existing extra headers, and carry them forward. Signed-off-by: Junio C Hamano --- commit.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'commit.h') diff --git a/commit.h b/commit.h index c1a723ecdb..3745f12099 100644 --- a/commit.h +++ b/commit.h @@ -200,6 +200,9 @@ extern int commit_tree_extended(const char *msg, unsigned char *tree, const char *author, struct commit_extra_header *); +extern struct commit_extra_header *read_commit_extra_headers(struct commit *); +extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len); + extern void free_commit_extra_headers(struct commit_extra_header *extra); struct merge_remote_desc { -- cgit v1.2.1