t0006: skip "far in the future" test when unsigned long is not long enough

diff --git a/test-subprocess.c b/test-subprocess.c
index f2d4c0d22bd418836eb47424a03d0e903246d92e..56881a032471752ca16880d98ea1510e16d38eed 100644 (file)
--- a/test-subprocess.c
+++ b/test-subprocess.c
@@ -1,9 +1,9 @@
 #include "cache.h"
 #include "run-command.h"
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
-       struct child_process cp;
+       struct child_process cp = CHILD_PROCESS_INIT;
        int nogit = 0;
 
        setup_git_directory_gently(&nogit);
@@ -13,8 +13,7 @@ int main(int argc, const char **argv)
                setup_work_tree();
                argv++;
        }
-       memset(&cp, 0, sizeof(cp));
        cp.git_cmd = 1;
-       cp.argv = argv + 1;
+       cp.argv = (const char **)argv + 1;
        return run_command(&cp);
 }