X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.h;h=01eec60a1ecc2ff3c73850cb510ba71767e47e03;hb=81f3a188a3781fa4a818ed27ee83430682a98ec4;hp=98682b232a2c28a4baa970ec81dfb027c196872f;hpb=8a414ad50cd9edfe6c8f0a6b9b08df4aaa9ccb75;p=git.git diff --git a/commit.h b/commit.h index 98682b23..01eec60a 100644 --- a/commit.h +++ b/commit.h @@ -45,6 +45,9 @@ enum cmit_fmt { CMIT_FMT_FULL, CMIT_FMT_FULLER, CMIT_FMT_ONELINE, + CMIT_FMT_EMAIL, + + CMIT_FMT_UNSPECIFIED, }; extern enum cmit_fmt get_commit_format(const char *arg); @@ -90,4 +93,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo); void sort_in_topological_order_fn(struct commit_list ** list, int lifo, topo_sort_set_fn_t setter, topo_sort_get_fn_t getter); + +struct commit_graft { + unsigned char sha1[20]; + int nr_parent; + unsigned char parent[FLEX_ARRAY][20]; /* more */ +}; + +struct commit_graft *read_graft_line(char *buf, int len); +int register_commit_graft(struct commit_graft *, int); +int read_graft_file(const char *graft_file); + #endif /* COMMIT_H */