summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-08 15:38:07 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-09 22:27:11 -0800
commited7a42a0752fd71cf04273b8e691966dd2c33ebe (patch)
tree222f7e6815eecc11fb319526172e275e15d75ae5 /commit.h
parentfab47d057559301c74d6642576694fd251a3fd11 (diff)
downloadgit-ed7a42a0752fd71cf04273b8e691966dd2c33ebe.tar.gz
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 <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h3
1 files changed, 3 insertions, 0 deletions
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 {