X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=log-tree.h;h=a26e4841ff9f568f8536f286e3fc40f09b9dff3b;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=da166c6f2c7b3a0fae80fbe63c8cde38eb609054;hpb=55275b3812af3fe84516f176e589100232aef4f5;p=git.git

diff --git a/log-tree.h b/log-tree.h
index da166c6f..a26e4841 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -1,23 +1,16 @@
 #ifndef LOG_TREE_H
 #define LOG_TREE_H
 
-struct log_tree_opt {
-	struct diff_options diffopt;
-	int show_root_diff;
-	int no_commit_id;
-	int verbose_header;
-	int ignore_merges;
-	int combine_merges;
-	int dense_combined_merges;
-	int always_show_header;
-	const char *header_prefix;
-	const char *header;
-	enum cmit_fmt commit_format;
+#include "revision.h"
+
+struct log_info {
+	struct commit *commit, *parent;
 };
 
-void init_log_tree_opt(struct log_tree_opt *);
-int log_tree_diff_flush(struct log_tree_opt *);
-int log_tree_commit(struct log_tree_opt *, struct commit *);
-int log_tree_opt_parse(struct log_tree_opt *, const char **, int);
+void init_log_tree_opt(struct rev_info *);
+int log_tree_diff_flush(struct rev_info *);
+int log_tree_commit(struct rev_info *, struct commit *);
+int log_tree_opt_parse(struct rev_info *, const char **, int);
+void show_log(struct rev_info *opt, struct log_info *log, const char *sep);
 
 #endif