Revert "builtin-archive: use RUN_SETUP"

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index c559510b46d7aa84187b616be1ed7654a0447ec8..83507a07e4cbaab81f130891a64b78539d1beede 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -47,6 +47,7 @@ enum cmit_fmt {
        CMIT_FMT_FULLER,
        CMIT_FMT_ONELINE,
        CMIT_FMT_EMAIL,
+       CMIT_FMT_USERFORMAT,
 
        CMIT_FMT_UNSPECIFIED,
 };
@@ -108,9 +109,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 int is_repository_shallow(void);
 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 *, struct commit **, int);
 #endif /* COMMIT_H */