Merge branch 'maint-2.1' into maint

[thirdparty/git.git] / run-command.h

diff --git a/run-command.h b/run-command.h
index ea73de309bc65c3d00bb34ad84824ba72d85cbfe..2137315ee46f672d945e0d3e011a8cbfbd5582a7 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -10,6 +10,7 @@
 struct child_process {
        const char **argv;
        struct argv_array args;
+       struct argv_array env_array;
        pid_t pid;
        /*
         * Using .in, .out, .err:
@@ -44,6 +45,9 @@ struct child_process {
        unsigned clean_on_exit:1;
 };
 
+#define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT }
+void child_process_init(struct child_process *);
+
 int start_command(struct child_process *);
 int finish_command(struct child_process *);
 int run_command(struct child_process *);