diff options
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -247,9 +247,9 @@ struct commit_graft { }; typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); -struct commit_graft *read_graft_line(char *buf, int len); +struct commit_graft *read_graft_line(struct strbuf *line); int register_commit_graft(struct commit_graft *, int); -struct commit_graft *lookup_commit_graft(const unsigned char *sha1); +struct commit_graft *lookup_commit_graft(const struct object_id *oid); extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2); extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos); @@ -313,11 +313,6 @@ extern int interactive_add(int argc, const char **argv, const char *prefix, int extern int run_add_interactive(const char *revision, const char *patch_mode, const struct pathspec *pathspec); -static inline int single_parent(struct commit *commit) -{ - return commit->parents && !commit->parents->next; -} - struct commit_list *reduce_heads(struct commit_list *heads); struct commit_extra_header { |