add-patch: split out header from "add-interactive.h"

While we have a "add-patch.c" code file, its declarations are part of
"add-interactive.h". This makes it somewhat harder than necessary to
find relevant code and to identify clear boundaries between the two
subsystems.

Split up concerns and move declarations that relate to "add-patch.c"
into a new "add-patch.h" header.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/add-interactive.h b/add-interactive.h
index 784339777509f7091823ac4bdcb2d6984cdde3d6..6c62489bfef2879fdc46298c2529021afc96d418 100644 (file)
--- a/add-interactive.h
+++ b/add-interactive.h
@@ -1,15 +1,11 @@
 #ifndef ADD_INTERACTIVE_H
 #define ADD_INTERACTIVE_H
 
+#include "add-patch.h"
 #include "color.h"
 
-struct add_p_opt {
-       int context;
-       int interhunkcontext;
-       int auto_advance;
-};
-
-#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1, .auto_advance = 1 }
+struct pathspec;
+struct repository;
 
 struct add_i_state {
        struct repository *r;
@@ -37,21 +33,7 @@ void init_add_i_state(struct add_i_state *s, struct repository *r,
                      struct add_p_opt *add_p_opt);
 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,
              struct add_p_opt *add_p_opt);
 
-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,
-             struct add_p_opt *o, const char *revision,
-             const struct pathspec *ps);
-
 #endif

diff --git a/add-patch.c b/add-patch.c
index 8c03f710d380c1209c18a08db761fd1d64f4cf4f..8ce2fc02f6d2e5c188b6888da5ef1523dc094e7c 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -3,6 +3,7 @@
 
 #include "git-compat-util.h"
 #include "add-interactive.h"
+#include "add-patch.h"
 #include "advice.h"
 #include "editor.h"
 #include "environment.h"

diff --git a/add-patch.h b/add-patch.h
new file mode 100644 (file)
index 0000000..88b00ca
--- /dev/null
+++ b/add-patch.h
@@ -0,0 +1,27 @@
+#ifndef ADD_PATCH_H
+#define ADD_PATCH_H
+
+struct pathspec;
+struct repository;
+
+struct add_p_opt {
+       int context;
+       int interhunkcontext;
+       int auto_advance;
+};
+
+#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1, .auto_advance = 1 }
+
+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,
+             struct add_p_opt *o, const char *revision,
+             const struct pathspec *ps);
+
+#endif