Merge branch 'maint-2.1' into maint

[thirdparty/git.git] / test-subprocess.c

diff --git a/test-subprocess.c b/test-subprocess.c
index 93525eb7be48eb11c242200827a7f6f0706ee241..56881a032471752ca16880d98ea1510e16d38eed 100644 (file)
--- a/test-subprocess.c
+++ b/test-subprocess.c
@@ -3,7 +3,7 @@
 
 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,7 +13,6 @@ int main(int argc, char **argv)
                setup_work_tree();
                argv++;
        }
-       memset(&cp, 0, sizeof(cp));
        cp.git_cmd = 1;
        cp.argv = (const char **)argv + 1;
        return run_command(&cp);