xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index c559510b46d7aa84187b616be1ed7654a0447ec8..936f8fce301672b5b78352a217403cc319ab3f07 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -108,9 +108,11 @@ int read_graft_file(const char *graft_file);
 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 
 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 struct commit_list *get_shallow_commits(struct object_array *heads,
-               int depth);
+               int depth, int shallow_flag, int not_shallow_flag);
 
+int in_merge_bases(struct commit *rev1, struct commit *rev2);
 #endif /* COMMIT_H */