Sync with Git 2.17.1

diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index 94846550f74a843f979de14116ab2df5dd15f6e3..ae091d9b3e63cb506b2530217d40048b301faaa3 100644 (file)
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"
 #include "cache.h"
 #include "string-list.h"
 #include "utf8.h"
@@ -176,7 +177,7 @@ static int is_dotgitmodules(const char *path)
        return is_hfs_dotgitmodules(path) || is_ntfs_dotgitmodules(path);
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd__path_utils(int argc, const char **argv)
 {
        if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
                char *buf = xmallocz(strlen(argv[2]));