diff options
author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-02-16 18:36:38 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 11:59:44 -0800 |
commit | e72ae28895b22052b7ca2eef36c039ac62671f7d (patch) | |
tree | 35e5df11a285b4467054fcec75cf8e35f38093e1 /builtin-fetch-pack.c | |
parent | 923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c (diff) | |
download | git-e72ae28895b22052b7ca2eef36c039ac62671f7d.tar.gz git-e72ae28895b22052b7ca2eef36c039ac62671f7d.tar.xz |
start_command(), .in/.out/.err = -1: Callers must close the file descriptor
By setting .in, .out, or .err members of struct child_process to -1, the
callers of start_command() can request that a pipe is allocated that talks
to the child process and one end is returned by replacing -1 with the
file descriptor.
Previously, a flag was set (for .in and .out, but not .err) to signal
finish_command() to close the pipe end that start_command() had handed out,
so it was optional for callers to close the pipe, and many already do so.
Now we make it mandatory to close the pipe.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fetch-pack.c')
-rw-r--r-- | builtin-fetch-pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index f40135248..5ea48ca7d 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -538,8 +538,10 @@ static int get_pack(int xd[2], char **pack_lockfile) cmd.git_cmd = 1; if (start_command(&cmd)) die("fetch-pack: unable to fork off %s", argv[0]); - if (do_keep && pack_lockfile) + if (do_keep && pack_lockfile) { *pack_lockfile = index_pack_lockfile(cmd.out); + close(cmd.out); + } if (finish_command(&cmd)) die("%s failed", argv[0]); |