reset: add test cases for "--keep" option

diff --git a/revision.h b/revision.h
index 921656aaabe74adaf24c8a14426f9533040a4669..a14deefc252bd641fba5e16f7859b4a985a72578 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -80,10 +80,15 @@ struct rev_info {
        /* Format info */
        unsigned int    shown_one:1,
                        show_merge:1,
+                       show_notes:1,
+                       show_notes_given:1,
+                       pretty_given:1,
                        abbrev_commit:1,
                        use_terminator:1,
                        missing_newline:1,
                        date_mode_explicit:1;
+       unsigned int    disable_stdin:1;
+
        enum date_mode date_mode;
 
        unsigned int    abbrev;
@@ -129,8 +134,6 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     3       /* Mixed changes */
 
 /* revision.c */
-void read_revisions_from_stdin(struct rev_info *revs);
-
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 extern volatile show_early_output_fn_t show_early_output;