Merge branch 'js/no-limit-boundary'

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index e9e158f4e1c670635dda02766f67da3821374669..c73744463ca55ce0df3623dffbb994bd4a86d76e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -110,8 +110,9 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
 extern int register_shallow(const unsigned char *sha1);
 extern int unregister_shallow(const unsigned char *sha1);
 extern int write_shallow_commits(int fd, int use_pack_protocol);
-extern int is_repository_shallow();
+extern int is_repository_shallow(void);
 extern struct commit_list *get_shallow_commits(struct object_array *heads,
                int depth, int shallow_flag, int not_shallow_flag);
 
+int in_merge_bases(struct commit *, struct commit **, int);
 #endif /* COMMIT_H */