The sixth batch

[thirdparty/git.git] / add-interactive.h

diff --git a/add-interactive.h b/add-interactive.h
index 062dc3646c2fd41df3b767d8fa64c8e454e846c0..693f125e8e4bc64ac0ccc8ac3b8dea812a397330 100644 (file)
--- a/add-interactive.h
+++ b/add-interactive.h
@@ -15,13 +15,27 @@ struct add_i_state {
        char context_color[COLOR_MAXLEN];
        char file_old_color[COLOR_MAXLEN];
        char file_new_color[COLOR_MAXLEN];
+
+       int use_single_key;
+       char *interactive_diff_filter, *interactive_diff_algorithm;
 };
 
 void init_add_i_state(struct add_i_state *s, struct repository *r);
+void clear_add_i_state(struct add_i_state *s);
 
 struct repository;
 struct pathspec;
 int run_add_i(struct repository *r, const struct pathspec *ps);
-int run_add_p(struct repository *r, const struct pathspec *ps);
+
+enum add_p_mode {
+       ADD_P_ADD,
+       ADD_P_STASH,
+       ADD_P_RESET,
+       ADD_P_CHECKOUT,
+       ADD_P_WORKTREE,
+};
+
+int run_add_p(struct repository *r, enum add_p_mode mode,
+             const char *revision, const struct pathspec *ps);
 
 #endif