Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index fcc0de8eea9e0b6c14966b8a10f35e9c4be35de9..568f1c98de844dbadcebf1d583bffc24e6daa677 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -3,6 +3,7 @@
 
 #include "parse-options.h"
 #include "grep.h"
+#include "notes.h"
 
 #define SEEN           (1u<<0)
 #define UNINTERESTING   (1u<<1)
@@ -20,6 +21,7 @@
 
 struct rev_info;
 struct log_info;
+struct string_list;
 
 struct rev_info {
        /* Starting list */
@@ -126,6 +128,9 @@ struct rev_info {
        struct reflog_walk_info *reflog_info;
        struct decoration children;
        struct decoration merge_simplification;
+
+       /* notes-specific options: which refs to show */
+       struct display_notes_opt notes_opt;
 };
 
 #define REV_TREE_SAME          0
@@ -139,6 +144,7 @@ extern volatile show_early_output_fn_t show_early_output;
 
 struct setup_revision_opt {
        const char *def;
+       void (*tweak)(struct rev_info *, struct setup_revision_opt *);
 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);