X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=commit.h;h=eb2b8ac3cd5f375e70354e8c364abd036b0966ed;hb=452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e;hp=2c0742b721fe1d4d78a7a63ed1c2ee1cf9c96ab8;hpb=ad336054068074ed614d0bb54bb169e5263499d7;p=git.git diff --git a/commit.h b/commit.h index 2c0742b72..eb2b8ac3c 100644 --- a/commit.h +++ b/commit.h @@ -28,6 +28,7 @@ extern const char *commit_type; extern struct decoration name_decoration; struct name_decoration { struct name_decoration *next; + int type; char name[1]; }; @@ -60,7 +61,7 @@ enum cmit_fmt { CMIT_FMT_EMAIL, CMIT_FMT_USERFORMAT, - CMIT_FMT_UNSPECIFIED, + CMIT_FMT_UNSPECIFIED }; struct pretty_print_context @@ -74,12 +75,16 @@ struct pretty_print_context struct reflog_walk_info *reflog_info; }; -extern int non_ascii(int); +struct userformat_want { + unsigned notes:1; +}; + extern int has_non_ascii(const char *text); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ extern char *reencode_commit_message(const struct commit *commit, const char **encoding_p); extern void get_commit_format(const char *arg, struct rev_info *); +extern void userformat_find_requirements(const char *fmt, struct userformat_want *w); extern void format_commit_message(const struct commit *commit, const char *format, struct strbuf *sb, const struct pretty_print_context *context); @@ -159,4 +164,8 @@ static inline int single_parent(struct commit *commit) struct commit_list *reduce_heads(struct commit_list *heads); +extern int commit_tree(const char *msg, unsigned char *tree, + struct commit_list *parents, unsigned char *ret, + const char *author); + #endif /* COMMIT_H */