Merge branch 'ar/chmod-series' into next

diff --git a/log-tree.h b/log-tree.h
index 8d8f6f14589fed87a8e77455a7eb4ef814f2d40b..a26e4841ff9f568f8536f286e3fc40f09b9dff3b 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -3,34 +3,14 @@
 
 #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;
+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);
-
-struct whatchanged_opt {
-       struct rev_info revopt;
-       struct log_tree_opt logopt;
-       int abbrev;
-       int abbrev_commit;
-       int do_diff;
-       int full_diff;
-};
-
-int parse_whatchanged_opt(int, const char **, struct whatchanged_opt *);
+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