Re-implement "check_file_directory_conflict()"

diff --git a/commit.h b/commit.h
index 8147551c9edc112d2a046e4fc80c65bcb259ba73..57c1b62faf2b0e4dffcfec45baa6bdf1ce883350 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -19,8 +19,8 @@ struct commit {
 
 extern const char *commit_type;
 
-struct commit *lookup_commit(unsigned char *sha1);
-struct commit *lookup_commit_reference(unsigned char *sha1);
+struct commit *lookup_commit(const unsigned char *sha1);
+struct commit *lookup_commit_reference(const unsigned char *sha1);
 
 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
 
@@ -32,8 +32,17 @@ void free_commit_list(struct commit_list *list);
 
 void sort_by_date(struct commit_list **list);
 
-extern unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf, unsigned long space);
+/* Commit formats */
+enum cmit_fmt {
+       CMIT_FMT_RAW,
+       CMIT_FMT_MEDIUM,
+       CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
+       CMIT_FMT_SHORT
+};
+
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space);
 
+void insert_by_date(struct commit_list **list, struct commit *item);
 
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
@@ -41,4 +50,7 @@ extern unsigned long pretty_print_commit(const char *msg, unsigned long len, cha
 struct commit *pop_most_recent_commit(struct commit_list **list, 
                                      unsigned int mark);
 
+struct commit *pop_commit(struct commit_list **stack);
+
+int count_parents(struct commit * commit);
 #endif /* COMMIT_H */