Merge branch 'jh/add-index-entry-optim'

diff --git a/revision.h b/revision.h
index 01d2d3e33de4ecd8baa808ef2f5553a4a29f0127..14886ec92b4f67527a86fc821998214a4d2b321f 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -135,6 +135,7 @@ struct rev_info {
                        pretty_given:1,
                        abbrev_commit:1,
                        abbrev_commit_given:1,
+                       zero_commit:1,
                        use_terminator:1,
                        missing_newline:1,
                        date_mode_explicit:1,
@@ -146,7 +147,9 @@ struct rev_info {
                        track_first_time:1,
                        linear:1;
 
-       enum date_mode date_mode;
+       struct date_mode date_mode;
+       int             expand_tabs_in_log; /* unset if negative */
+       int             expand_tabs_in_log_default;
 
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;