[PATCH 3/4] git_connect: allow a file descriptor to be allocated for stderr
- From
Mike Hommey <mh@glandium.org>
- Date
- Apr 28, 2016, 14:12 UTC
- Message-ID
- <1461852759-28429-4-git-send-email-mh@glandium.org>
- In-Reply-To
- <1461852759-28429-1-git-send-email-mh@glandium.org>
It can be useful to the caller of git_connect() to get access to stderr, so add a flag that makes start_command allocate a file descriptor for it.
Signed-off-by: Mike Hommey <mh@glandium.org> --- connect.c | 2 ++ connect.h | 1 + 2 files changed, 3 insertions(+)
diff --git a/connect.c b/connect.c index 919bf9e..9feedd8 100644 --- a/connect.c +++ b/connect.c @@ -764,6 +764,8 @@ struct child_process *git_connect(int fd[2], const char *url, conn->env = local_repo_env; conn->use_shell = 1; conn->in = conn->out = -1; + if (flags & CONNECT_WANT_STDERR) + conn->err = -1; if (protocol == PROTO_SSH) { const char *ssh; int putty = 0, tortoiseplink = 0; diff --git a/connect.h b/connect.h index 01f14cd..fb3331b 100644 --- a/connect.h +++ b/connect.h @@ -5,6 +5,7 @@ #define CONNECT_DIAG_URL (1u << 1) #define CONNECT_IPV4 (1u << 2) #define CONNECT_IPV6 (1u << 3) +#define CONNECT_WANT_STDERR (1u << 4) extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags); extern int finish_connect(struct child_process *conn); extern int git_connection_is_socket(struct child_process *conn);
-- 2.8.1.5.g18c8a48