diff-tree: don't print multiple headers for merges when silent.

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index c8684d1..620e936 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -19,6 +19,9 @@ struct commit {
 extern const char *commit_type;
 
 struct commit *lookup_commit(unsigned char *sha1);
+struct commit *lookup_commit_reference(unsigned char *sha1);
+
+int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
 
 int parse_commit(struct commit *item);
 
@@ -31,6 +34,7 @@ void sort_by_date(struct commit_list **list);
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
  **/
-struct commit *pop_most_recent_commit(struct commit_list **list);
+struct commit *pop_most_recent_commit(struct commit_list **list, 
+                                     unsigned int mark);
 
 #endif /* COMMIT_H */