X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.h;h=de142afe733a6ecd3bcec2abd9f71a358b4ae09d;hb=5c477b972583e96b65ef1613c5d0fb1b90af3d0e;hp=98682b232a2c28a4baa970ec81dfb027c196872f;hpb=41ce93bea4a90becb0e4a84c58dc2f78e7a6d19b;p=git.git diff --git a/commit.h b/commit.h index 98682b23..de142afe 100644 --- a/commit.h +++ b/commit.h @@ -45,6 +45,8 @@ enum cmit_fmt { CMIT_FMT_FULL, CMIT_FMT_FULLER, CMIT_FMT_ONELINE, + + CMIT_FMT_UNSPECIFIED, }; extern enum cmit_fmt get_commit_format(const char *arg); @@ -90,4 +92,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 */