Merge branch 'maint'

diff --git a/commit.h b/commit.h
index bd841f4d0c5e2b7fb8e83d55ba0d0b7e2839bf8a..934af889f7d8f1aa9fba0e9ff900b1f1132a44a7 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -49,6 +49,7 @@ struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_n
 
 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
 int parse_commit(struct commit *item);
+void parse_commit_or_die(struct commit *item);
 
 /* Find beginning and length of commit subject. */
 int find_commit_subject(const char *commit_buffer, const char **subject);