Revert all the rev-list option parsing changes.

diff --git a/log-tree.h b/log-tree.h
index 91a909be73130b8542ed9092e120084bb263105b..da166c6f2c7b3a0fae80fbe63c8cde38eb609054 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -1,11 +1,23 @@
 #ifndef LOG_TREE_H
 #define LOG_TREE_H
 
-#include "revision.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;
+};
 
-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 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);
 
 #endif