exec_cmd: rename to use dash in file name

This is more consistent with the project style. The majority of Git's
source files use dashes in preference to underscores in their file names.

Signed-off-by: Stefan Beller <sbeller@google.com>

diff --git a/Makefile b/Makefile
index f83b7968319dfac1b9aca6282cdc8afd743fcba2..88730d6fdd4bbae8a7b842b822f6e0faa99a4e3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -818,7 +818,7 @@ LIB_OBJS += ewah/bitmap.o
 LIB_OBJS += ewah/ewah_bitmap.o
 LIB_OBJS += ewah/ewah_io.o
 LIB_OBJS += ewah/ewah_rlw.o
-LIB_OBJS += exec_cmd.o
+LIB_OBJS += exec-cmd.o
 LIB_OBJS += fetch-object.o
 LIB_OBJS += fetch-pack.o
 LIB_OBJS += fsck.o
@@ -2155,8 +2155,8 @@ else
 $(OBJECTS): $(LIB_H)
 endif
 
-exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX
-exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
+exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX
+exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \
        '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
        '-DBINDIR="$(bindir_relative_SQ)"' \
        '-DPREFIX="$(prefix_SQ)"'

diff --git a/attr.c b/attr.c
index dfc3a558d83737921e1f97c96886539ef5fc3acb..03a678fa9be09ac71da4b654c99c1ab26bde3430 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -10,7 +10,7 @@
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "attr.h"
 #include "dir.h"
 #include "utf8.h"

diff --git a/builtin/add.c b/builtin/add.c
index 9ef7fb02d56aac94d104b50aed7d7dfda09cfc98..c9e2619a9ad8febc10e4132c88e7a74c6c9bbeaf 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -9,7 +9,7 @@
 #include "lockfile.h"
 #include "dir.h"
 #include "pathspec.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "cache-tree.h"
 #include "run-command.h"
 #include "parse-options.h"

diff --git a/builtin/am.c b/builtin/am.c
index 9c82603f70ff9605aa25c78023355b94860a7ce0..d834f9e62b6a0f5550909b5a0bb43cce0e48e8ec 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -6,7 +6,7 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 #include "dir.h"
 #include "run-command.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index de840f96a4ba0135667261cfd74c674672f4c6b4..b5afc4584632d35afe26f4c3d0dfb09e777518b1 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -6,7 +6,7 @@
 #include "blob.h"
 #include "refs.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 #include "revision.h"
 #include "diff.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index ee8dce019e1ca04111de185b5f47c12076b32a0c..aad0e073ee61648a73843ceddffbab6047c9721b 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 #include "argv-array.h"
 #include "strbuf.h"

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 526da5c1856ed1c387975a767f4d01382d1ea1a9..a9a3a198c3b47197cb847ba32a33177f1a45f428 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -9,7 +9,7 @@
 #include "blob.h"
 #include "quote.h"
 #include "parse-options.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 
 /*
  * This is to create corrupt objects for debugging and as such it

diff --git a/builtin/help.c b/builtin/help.c
index 598867cfea40c6e0df25111c5484dde5d2cd8b47..2d5107142926d46230d17715211338c1aa171e69 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -4,7 +4,7 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 #include "run-command.h"
 #include "column.h"

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d81473e722e7c99b9b05b34506fa4925196ff6d7..7700907f1b2c169dfb969d255cd9d61953cfb9f4 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -9,7 +9,7 @@
 #include "tree.h"
 #include "progress.h"
 #include "fsck.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "streaming.h"
 #include "thread-utils.h"
 #include "packfile.h"

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 68ff4ad75ace6566a233c1343fed93365c5abbe4..2542c5244e91b68692c7ed371fa9976997ee8ff5 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -7,7 +7,7 @@
 #include "config.h"
 #include "refs.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 
 #ifndef DEFAULT_GIT_TEMPLATE_DIR

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 32736e0b1011f575d2585fd2e012501d807f9e9b..bf01e05808313da20ed73c37d0d150c4ddb45587 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -2,7 +2,7 @@
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "blob.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "merge-blobs.h"
 
 static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";

diff --git a/builtin/notes.c b/builtin/notes.c
index 921e08d5bf545ac4124933459d257d95e2144409..e5bf80eef1d4113ac9c5361f200bb7b162de18a6 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -14,7 +14,7 @@
 #include "blob.h"
 #include "pretty.h"
 #include "refs.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "parse-options.h"
 #include "string-list.h"

diff --git a/builtin/pull.c b/builtin/pull.c
index e32d6cd5b4c999bc45b961c1387af066c72a823a..71aac5005e0c0c8cf156cdf69621b687973f9ecc 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -9,7 +9,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "parse-options.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "sha1-array.h"
 #include "remote.h"

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c4272fbc96dc274f3287ab01f3fbe57c2cdb9d9c..4b68a28e92e726b4d16c4d3a0a339feb1aeacaee 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -7,7 +7,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "commit.h"
 #include "object.h"
 #include "remote.h"

diff --git a/common-main.c b/common-main.c
index 7d716d5a5491ba6b3a596f2128c4f08253d1d364..b989e136b5df3736ae8e14264b9738df204f91e8 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "attr.h"
 
 /*

diff --git a/config.c b/config.c
index c698988f5e11cd416bef9a77c998d94b9ef87930..e2b87b4764070ccc2a6dceafbd96ca158ea85f5e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -9,7 +9,7 @@
 #include "config.h"
 #include "repository.h"
 #include "lockfile.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "strbuf.h"
 #include "quote.h"
 #include "hashmap.h"

diff --git a/exec-cmd.c b/exec-cmd.c
new file mode 100644 (file)
index 0000000..8a82617
--- /dev/null
+++ b/exec-cmd.c
@@ -0,0 +1,165 @@
+#include "cache.h"
+#include "exec-cmd.h"
+#include "quote.h"
+#include "argv-array.h"
+#define MAX_ARGS       32
+
+static const char *argv_exec_path;
+
+#ifdef RUNTIME_PREFIX
+static const char *argv0_path;
+
+static const char *system_prefix(void)
+{
+       static const char *prefix;
+
+       assert(argv0_path);
+       assert(is_absolute_path(argv0_path));
+
+       if (!prefix &&
+           !(prefix = strip_path_suffix(argv0_path, GIT_EXEC_PATH)) &&
+           !(prefix = strip_path_suffix(argv0_path, BINDIR)) &&
+           !(prefix = strip_path_suffix(argv0_path, "git"))) {
+               prefix = PREFIX;
+               trace_printf("RUNTIME_PREFIX requested, "
+                               "but prefix computation failed.  "
+                               "Using static fallback '%s'.\n", prefix);
+       }
+       return prefix;
+}
+
+void git_extract_argv0_path(const char *argv0)
+{
+       const char *slash;
+
+       if (!argv0 || !*argv0)
+               return;
+
+       slash = find_last_dir_sep(argv0);
+
+       if (slash)
+               argv0_path = xstrndup(argv0, slash - argv0);
+}
+
+#else
+
+static const char *system_prefix(void)
+{
+       return PREFIX;
+}
+
+void git_extract_argv0_path(const char *argv0)
+{
+}
+
+#endif /* RUNTIME_PREFIX */
+
+char *system_path(const char *path)
+{
+       struct strbuf d = STRBUF_INIT;
+
+       if (is_absolute_path(path))
+               return xstrdup(path);
+
+       strbuf_addf(&d, "%s/%s", system_prefix(), path);
+       return strbuf_detach(&d, NULL);
+}
+
+void git_set_argv_exec_path(const char *exec_path)
+{
+       argv_exec_path = exec_path;
+       /*
+        * Propagate this setting to external programs.
+        */
+       setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
+}
+
+
+/* Returns the highest-priority, location to look for git programs. */
+const char *git_exec_path(void)
+{
+       static char *cached_exec_path;
+
+       if (argv_exec_path)
+               return argv_exec_path;
+
+       if (!cached_exec_path) {
+               const char *env = getenv(EXEC_PATH_ENVIRONMENT);
+               if (env && *env)
+                       cached_exec_path = xstrdup(env);
+               else
+                       cached_exec_path = system_path(GIT_EXEC_PATH);
+       }
+       return cached_exec_path;
+}
+
+static void add_path(struct strbuf *out, const char *path)
+{
+       if (path && *path) {
+               strbuf_add_absolute_path(out, path);
+               strbuf_addch(out, PATH_SEP);
+       }
+}
+
+void setup_path(void)
+{
+       const char *old_path = getenv("PATH");
+       struct strbuf new_path = STRBUF_INIT;
+
+       add_path(&new_path, git_exec_path());
+
+       if (old_path)
+               strbuf_addstr(&new_path, old_path);
+       else
+               strbuf_addstr(&new_path, _PATH_DEFPATH);
+
+       setenv("PATH", new_path.buf, 1);
+
+       strbuf_release(&new_path);
+}
+
+const char **prepare_git_cmd(struct argv_array *out, const char **argv)
+{
+       argv_array_push(out, "git");
+       argv_array_pushv(out, argv);
+       return out->argv;
+}
+
+int execv_git_cmd(const char **argv) {
+       struct argv_array nargv = ARGV_ARRAY_INIT;
+
+       prepare_git_cmd(&nargv, argv);
+       trace_argv_printf(nargv.argv, "trace: exec:");
+
+       /* execvp() can only ever return if it fails */
+       sane_execvp("git", (char **)nargv.argv);
+
+       trace_printf("trace: exec failed: %s\n", strerror(errno));
+
+       argv_array_clear(&nargv);
+       return -1;
+}
+
+
+int execl_git_cmd(const char *cmd,...)
+{
+       int argc;
+       const char *argv[MAX_ARGS + 1];
+       const char *arg;
+       va_list param;
+
+       va_start(param, cmd);
+       argv[0] = cmd;
+       argc = 1;
+       while (argc < MAX_ARGS) {
+               arg = argv[argc++] = va_arg(param, char *);
+               if (!arg)
+                       break;
+       }
+       va_end(param);
+       if (MAX_ARGS <= argc)
+               return error("too many args to run %s", cmd);
+
+       argv[argc] = NULL;
+       return execv_git_cmd(argv);
+}

diff --git a/exec-cmd.h b/exec-cmd.h
new file mode 100644 (file)
index 0000000..ff0b480
--- /dev/null
+++ b/exec-cmd.h
@@ -0,0 +1,16 @@
+#ifndef GIT_EXEC_CMD_H
+#define GIT_EXEC_CMD_H
+
+struct argv_array;
+
+extern void git_set_argv_exec_path(const char *exec_path);
+extern void git_extract_argv0_path(const char *path);
+extern const char *git_exec_path(void);
+extern void setup_path(void);
+extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);
+extern int execv_git_cmd(const char **argv); /* NULL terminated */
+LAST_ARG_MUST_BE_NULL
+extern int execl_git_cmd(const char *cmd, ...);
+extern char *system_path(const char *path);
+
+#endif /* GIT_EXEC_CMD_H */

diff --git a/exec_cmd.c b/exec_cmd.c
deleted file mode 100644 (file)
index ce192a2..0000000
--- a/exec_cmd.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "cache.h"
-#include "exec_cmd.h"
-#include "quote.h"
-#include "argv-array.h"
-#define MAX_ARGS       32
-
-static const char *argv_exec_path;
-
-#ifdef RUNTIME_PREFIX
-static const char *argv0_path;
-
-static const char *system_prefix(void)
-{
-       static const char *prefix;
-
-       assert(argv0_path);
-       assert(is_absolute_path(argv0_path));
-
-       if (!prefix &&
-           !(prefix = strip_path_suffix(argv0_path, GIT_EXEC_PATH)) &&
-           !(prefix = strip_path_suffix(argv0_path, BINDIR)) &&
-           !(prefix = strip_path_suffix(argv0_path, "git"))) {
-               prefix = PREFIX;
-               trace_printf("RUNTIME_PREFIX requested, "
-                               "but prefix computation failed.  "
-                               "Using static fallback '%s'.\n", prefix);
-       }
-       return prefix;
-}
-
-void git_extract_argv0_path(const char *argv0)
-{
-       const char *slash;
-
-       if (!argv0 || !*argv0)
-               return;
-
-       slash = find_last_dir_sep(argv0);
-
-       if (slash)
-               argv0_path = xstrndup(argv0, slash - argv0);
-}
-
-#else
-
-static const char *system_prefix(void)
-{
-       return PREFIX;
-}
-
-void git_extract_argv0_path(const char *argv0)
-{
-}
-
-#endif /* RUNTIME_PREFIX */
-
-char *system_path(const char *path)
-{
-       struct strbuf d = STRBUF_INIT;
-
-       if (is_absolute_path(path))
-               return xstrdup(path);
-
-       strbuf_addf(&d, "%s/%s", system_prefix(), path);
-       return strbuf_detach(&d, NULL);
-}
-
-void git_set_argv_exec_path(const char *exec_path)
-{
-       argv_exec_path = exec_path;
-       /*
-        * Propagate this setting to external programs.
-        */
-       setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
-}
-
-
-/* Returns the highest-priority, location to look for git programs. */
-const char *git_exec_path(void)
-{
-       static char *cached_exec_path;
-
-       if (argv_exec_path)
-               return argv_exec_path;
-
-       if (!cached_exec_path) {
-               const char *env = getenv(EXEC_PATH_ENVIRONMENT);
-               if (env && *env)
-                       cached_exec_path = xstrdup(env);
-               else
-                       cached_exec_path = system_path(GIT_EXEC_PATH);
-       }
-       return cached_exec_path;
-}
-
-static void add_path(struct strbuf *out, const char *path)
-{
-       if (path && *path) {
-               strbuf_add_absolute_path(out, path);
-               strbuf_addch(out, PATH_SEP);
-       }
-}
-
-void setup_path(void)
-{
-       const char *old_path = getenv("PATH");
-       struct strbuf new_path = STRBUF_INIT;
-
-       add_path(&new_path, git_exec_path());
-
-       if (old_path)
-               strbuf_addstr(&new_path, old_path);
-       else
-               strbuf_addstr(&new_path, _PATH_DEFPATH);
-
-       setenv("PATH", new_path.buf, 1);
-
-       strbuf_release(&new_path);
-}
-
-const char **prepare_git_cmd(struct argv_array *out, const char **argv)
-{
-       argv_array_push(out, "git");
-       argv_array_pushv(out, argv);
-       return out->argv;
-}
-
-int execv_git_cmd(const char **argv) {
-       struct argv_array nargv = ARGV_ARRAY_INIT;
-
-       prepare_git_cmd(&nargv, argv);
-       trace_argv_printf(nargv.argv, "trace: exec:");
-
-       /* execvp() can only ever return if it fails */
-       sane_execvp("git", (char **)nargv.argv);
-
-       trace_printf("trace: exec failed: %s\n", strerror(errno));
-
-       argv_array_clear(&nargv);
-       return -1;
-}
-
-
-int execl_git_cmd(const char *cmd,...)
-{
-       int argc;
-       const char *argv[MAX_ARGS + 1];
-       const char *arg;
-       va_list param;
-
-       va_start(param, cmd);
-       argv[0] = cmd;
-       argc = 1;
-       while (argc < MAX_ARGS) {
-               arg = argv[argc++] = va_arg(param, char *);
-               if (!arg)
-                       break;
-       }
-       va_end(param);
-       if (MAX_ARGS <= argc)
-               return error("too many args to run %s", cmd);
-
-       argv[argc] = NULL;
-       return execv_git_cmd(argv);
-}

diff --git a/exec_cmd.h b/exec_cmd.h
deleted file mode 100644 (file)
index ff0b480..0000000
--- a/exec_cmd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef GIT_EXEC_CMD_H
-#define GIT_EXEC_CMD_H
-
-struct argv_array;
-
-extern void git_set_argv_exec_path(const char *exec_path);
-extern void git_extract_argv0_path(const char *path);
-extern const char *git_exec_path(void);
-extern void setup_path(void);
-extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);
-extern int execv_git_cmd(const char **argv); /* NULL terminated */
-LAST_ARG_MUST_BE_NULL
-extern int execl_git_cmd(const char *cmd, ...);
-extern char *system_path(const char *path);
-
-#endif /* GIT_EXEC_CMD_H */

diff --git a/fetch-pack.c b/fetch-pack.c
index adc1b68dd3ae87e6ff7501e6f3f3760c7b923d5e..4a8bad8487f611c263bcd7e31febd08eed5bc6d7 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -6,7 +6,7 @@
 #include "pkt-line.h"
 #include "commit.h"
 #include "tag.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "pack.h"
 #include "sideband.h"
 #include "fetch-pack.h"

diff --git a/git.c b/git.c
index 3a89893712e6b327e714ad81d12d3e4ca354926c..f598fae7b7ab727abedc44decd2f51f107014088 100644 (file)
--- a/git.c
+++ b/git.c
@@ -1,6 +1,6 @@
 #include "builtin.h"
 #include "config.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "help.h"
 #include "run-command.h"
 

diff --git a/help.c b/help.c
index 60071a9beaaedf45730385b7fc1443b402c50156..a4feef2ffe90ae853c220b9368642c4edb503e5e 100644 (file)
--- a/help.c
+++ b/help.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "levenshtein.h"
 #include "help.h"

diff --git a/http-backend.c b/http-backend.c
index 88d2a9bc40b4b02e96a6679e856e3a9d1a4a0359..cc16cd04ad00a85c0a8a73eec837760b293a3489 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -5,7 +5,7 @@
 #include "pkt-line.h"
 #include "object.h"
 #include "tag.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "string-list.h"
 #include "url.h"

diff --git a/http-fetch.c b/http-fetch.c
index 8af380050ce6a43a6764ad871f0de141c316421a..885e4715013217bb3287dd8979b792e40c62d0f0 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "config.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "http.h"
 #include "walker.h"
 

diff --git a/http-push.c b/http-push.c
index c0998fd763b6178aa7c0d35603c9b56183d5157f..f308ce0195a5f0991996a3daad9b13809e8f7895 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -6,7 +6,7 @@
 #include "refs.h"
 #include "diff.h"
 #include "revision.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "remote.h"
 #include "list-objects.h"
 #include "sigchain.h"

diff --git a/imap-send.c b/imap-send.c
index ffb0a6eca8ce632dc448883a47987bf48adea31b..3573cbfb0fca7d524f3d3531f9f97ebeabdd15e6 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -24,7 +24,7 @@
 #include "cache.h"
 #include "config.h"
 #include "credential.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "parse-options.h"
 #ifdef NO_OPENSSL

diff --git a/remote-curl.c b/remote-curl.c
index a7c4c9b5ff4822e36bfc43a59d113c624537297e..8d2ffaf8de4a0e2d5c58f3904aee5c1823997ebc 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -4,7 +4,7 @@
 #include "strbuf.h"
 #include "walker.h"
 #include "http.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "pkt-line.h"
 #include "string-list.h"

diff --git a/remote-testsvn.c b/remote-testsvn.c
index c4bb9a8ba920c1b344b910e7f6e59915044f4f9a..444d98059f681e21beeb3e66fe8539887cfb74d1 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -3,7 +3,7 @@
 #include "remote.h"
 #include "strbuf.h"
 #include "url.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "vcs-svn/svndump.h"
 #include "notes.h"

diff --git a/run-command.c b/run-command.c
index 84899e423f098bb8cd61eee86bcc484139b1482f..12c94c1dbe5a720a7581af81516b6884fc25d8d0 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "sigchain.h"
 #include "argv-array.h"
 #include "thread-utils.h"

diff --git a/sequencer.c b/sequencer.c
index 667f35ebdffbc1ef730e310cbea9b3dbce786e21..6d631d25c669db4623bae3d945aecda2132adfab 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -7,7 +7,7 @@
 #include "sequencer.h"
 #include "tag.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "utf8.h"
 #include "cache-tree.h"
 #include "diff.h"

diff --git a/shell.c b/shell.c
index 234b2d4f16fe79e9260c8409bd4d7c964fe27e72..0200d10796c43d6ea1249c314ee158f2b57a481f 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "quote.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "strbuf.h"
 #include "run-command.h"
 

diff --git a/upload-pack.c b/upload-pack.c
index 4a82602be5d0ab111a805a2f2456f382ae7a7364..6261d4fab32999322b2b1b866289b49077c63beb 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -6,7 +6,7 @@
 #include "tag.h"
 #include "object.h"
 #include "commit.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "diff.h"
 #include "revision.h"
 #include "list-objects.h"