[PATCH] Ask for "git program" even against git-daemon
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Ask for "git program" even against git-daemon · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Ask for "git program" even against git-daemon · Shawn O. Pearce <hidden>
- 2016-06-15 · Re: [PATCH] Ask for "git program" even against git-daemon · Junio C Hamano <hidden>
This drops backward compatibility support to ask for "git-program" form when talking to git-daemon. Now all git native requests use "git program" form over ssh, local and git transports. This needs to be held back until everybody runs git-daemon from 1.5.6.1 or 1.6.0 or newer. Signed-off-by: Junio C Hamano <redacted> --- * According to the roadmap we exchanged earlier, this should happen in a major release (that increments the second dewey-decimal digit from the left) that ships at least 6 months after 1.5.6.1 and 1.6.0 (which will have the "git daemon preparation" patch included) are released. connect.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/connect.c b/connect.c
index 4a32ba4..f2e72c2 100644
--- a/connect.c
+++ b/connect.c@@ -567,7 +567,6 @@ struct child_process *git_connect(int fd[2], const char *url_orig, * cannot connect. */ char *target_host = xstrdup(host); - const char *program_prefix = ""; if (git_use_proxy(host)) git_proxy_connect(fd, host);
@@ -577,13 +576,9 @@ struct child_process *git_connect(int fd[2], const char *url_orig, * Separate original protocol components prog and path * from extended components with a NUL byte. */ - if (!prefixcmp(prog, "git ")) { - program_prefix = "git-"; - prog += 4; - } packet_write(fd[1], - "%s%s %s%chost=%s%c", - program_prefix, prog, path, 0, + "%s %s%chost=%s%c", + prog, path, 0, target_host, 0); free(target_host); free(url);
--
1.5.6.86.ge2da6