run-command.h: move declarations for run-command.c from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 891e5fec7444ff166cab6b9dc654cb9c01449e9c..d31b15150693d8bb9c1c885836461b6c085c4f34 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -555,7 +555,4 @@ int checkout_fast_forward(struct repository *r,
                          const struct object_id *to,
                          int overwrite_ignore);
 
-
-int sane_execvp(const char *file, char *const argv[]);
-
 #endif /* CACHE_H */

diff --git a/exec-cmd.c b/exec-cmd.c
index 1e34e48c0e467a96e806ce62bec682fb83979625..1d597e84ea7f4c3c8296cbf527bf0c5514037e99 100644 (file)
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -1,10 +1,11 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "path.h"
 #include "quote.h"
+#include "run-command.h"
 #include "strvec.h"
 #include "trace.h"
 #include "trace2.h"

diff --git a/run-command.c b/run-command.c
index 60c94198664738159fbae86afeb49bccd15f25e3..1ac2848b54e25b461de6ae93bc217e6e953d0920 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "run-command.h"
 #include "environment.h"
 #include "exec-cmd.h"

diff --git a/run-command.h b/run-command.h
index 072db56a4dff15996889bded735dd02f2bc52e73..9e47f91d462c34ab55a0829afb1ed9f4d4261427 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -564,4 +564,6 @@ enum start_bg_result start_bg_command(struct child_process *cmd,
                                      void *cb_data,
                                      unsigned int timeout_sec);
 
+int sane_execvp(const char *file, char *const argv[]);
+
 #endif