Merge fixes up to GIT 1.0.4

diff --git a/run-command.h b/run-command.h
index 5ee0972241030d2f6d87a465c4726e6cc3ab803a..2469eeaefbc19424d5ec61f173cc17b68a183bc5 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -11,6 +11,9 @@ enum {
        ERR_RUN_COMMAND_WAITPID_NOEXIT,
 };
 
+#define RUN_COMMAND_NO_STDIO 1
+
+int run_command_v_opt(int argc, char **argv, int opt);
 int run_command_v(int argc, char **argv);
 int run_command(const char *cmd, ...);