diff --git a/run-command.c b/run-command.c index 296e2c4d487f4c..ad803274ea9a51 100644 --- a/run-command.c +++ b/run-command.c @@ -967,18 +967,24 @@ int start_command(struct child_process *cmd) return -1; } - if (need_in) + if (need_in) { close(fdin[0]); + set_cloexec(fdin[1]); + } else if (cmd->in) close(cmd->in); - if (need_out) + if (need_out) { close(fdout[1]); + set_cloexec(fdout[0]); + } else if (cmd->out) close(cmd->out); - if (need_err) + if (need_err) { close(fderr[1]); + set_cloexec(fderr[0]); + } else if (cmd->err) close(cmd->err); diff --git a/send-pack.c b/send-pack.c index 4cce09534509e6..9ff928e2f77bf0 100644 --- a/send-pack.c +++ b/send-pack.c @@ -15,7 +15,6 @@ #include "sha1-array.h" #include "gpg-interface.h" #include "cache.h" -#include "gvfs.h" int option_parse_push_signed(const struct option *opt, const char *arg, int unset) @@ -51,7 +50,7 @@ static int send_pack_config(const char *var, const char *value, void *unused) static void feed_object(const struct object_id *oid, FILE *fh, int negative) { - if (negative && !gvfs_config_is_set(GVFS_MISSING_OK) && !has_sha1_file(oid->hash)) + if (negative && !has_sha1_file(oid->hash)) return; if (negative)