diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-14 02:44:18 -0500 |
| commit | 1fcdd62adf81a172f45c7c6a58177212d500b9d9 (patch) | |
| tree | 94acde078fd78c3d214fe09d45e85ed346a2f2d4 /run-command.h | |
| parent | 9938ffc53a15c755bbd3894c02492b940ea34c4c (diff) | |
| parent | 696b1b507f8ff9e80a2edc4eced59ca8cdda920e (diff) | |
| download | git-1fcdd62adf81a172f45c7c6a58177212d500b9d9.tar.gz git-1fcdd62adf81a172f45c7c6a58177212d500b9d9.tar.xz | |
Merge branch 'master' into sp/fast-import
I'm bringing master in early so that the OBJ_OFS_DELTA implementation
is available as part of the topic. This way git-fast-import can
learn about this new slightly smaller and faster packfile format,
and can generate them directly rather than needing to have them be
repacked with git-pack-objects.
Due to the API changes in master during the period of development
of git-fast-import, a few minor tweaks to fast-import.c are needed
to produce a working merge. I've done them here as part of the
merge to ensure bisection always works.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'run-command.h')
| -rw-r--r-- | run-command.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/run-command.h b/run-command.h index 70b477a74..59c4476ce 100644 --- a/run-command.h +++ b/run-command.h @@ -11,10 +11,12 @@ enum { ERR_RUN_COMMAND_WAITPID_NOEXIT, }; -#define RUN_COMMAND_NO_STDIO 1 +#define RUN_COMMAND_NO_STDIN 1 #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ -int run_command_v_opt(int argc, const char **argv, int opt); -int run_command_v(int argc, const char **argv); +#define RUN_COMMAND_STDOUT_TO_STDERR 4 +int run_command_v_opt(const char **argv, int opt); +int run_command_v(const char **argv); +int run_command_opt(int opt, const char *cmd, ...); int run_command(const char *cmd, ...); #endif |