git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 5/9] connect: group CONNECT_DIAG_URL handling code

From
Mike Hommey <mh@glandium.org>
Date
May 17, 2016, 01:35 UTC
Message-ID
<20160517013554.22578-6-mh@glandium.org>
In-Reply-To
<20160517013554.22578-1-mh@glandium.org>

Previous changes made both branches handling CONNECT_DIAG_URL identical. We can now remove one of those branches and have CONNECT_DIAG_URL be handled in one place.

Signed-off-by: Mike Hommey <mh@glandium.org>
---
 connect.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/connect.c b/connect.c
index 4ce83f7..3a77b2f 100644
--- a/connect.c
+++ b/connect.c
@@ -708,7 +708,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 	signal(SIGCHLD, SIG_DFL);
 
 	protocol = parse_connect_url(url, &host, &port, &path);
-	if ((flags & CONNECT_DIAG_URL) && (protocol != PROTO_SSH)) {
+	if (flags & CONNECT_DIAG_URL) {
 		printf("Diag: url=%s\n", url ? url : "NULL");
 		printf("Diag: protocol=%s\n", prot_name(protocol));
 		printf("Diag: userandhost=%s\n", host ? host : "NULL");
@@ -778,20 +778,6 @@ struct child_process *git_connect(int fd[2], const char *url,
 			int putty = 0, tortoiseplink = 0;
 			transport_check_allowed("ssh");
 
-			if (flags & CONNECT_DIAG_URL) {
-				printf("Diag: url=%s\n", url ? url : "NULL");
-				printf("Diag: protocol=%s\n", prot_name(protocol));
-				printf("Diag: userandhost=%s\n", host ? host : "NULL");
-				printf("Diag: port=%s\n", port ? port : "NONE");
-				printf("Diag: path=%s\n", path ? path : "NULL");
-
-				free(host);
-				free(port);
-				free(path);
-				free(conn);
-				return NULL;
-			}
-
 			ssh = getenv("GIT_SSH_COMMAND");
 			if (!ssh) {
 				const char *base;
-- 
2.8.2.411.ga570dec.dirty
Previous: Mike HommeyNext: Mike Hommey
Message 13 of 17 in “connect: various cleanups”
  1. 0/9 connect: various cleanupsMike Hommey, May 17, 2016
  2. 1/9 connect: call get_host_and_port() earlierMike Hommey, May 17, 2016
  3. Junio C HamanoMay 20, 2016
  4. Mike HommeyMay 20, 2016
  5. Junio C HamanoMay 20, 2016
  6. Mike HommeyMay 20, 2016
  7. 2/9 connect: only match the host with core.gitProxyMike Hommey, May 17, 2016
  8. Junio C HamanoMay 20, 2016
  9. Mike HommeyMay 20, 2016
  10. Junio C HamanoMay 20, 2016
  11. 3/9 connect: fill the host header in the git protocol with the host and port variablesMike Hommey, May 17, 2016
  12. 4/9 connect: make parse_connect_url() return separated host and portMike Hommey, May 17, 2016
  13. 5/9 connect: group CONNECT_DIAG_URL handling codeMike Hommey, May 17, 2016
  14. 6/9 connect: make parse_connect_url() return the user part of the url as a separate valueMike Hommey, May 17, 2016
  15. 7/9 connect: change the --diag-url output to separate user and hostMike Hommey, May 17, 2016
  16. 8/9 connect: actively reject git:// urls with a user partMike Hommey, May 17, 2016
  17. 9/9 connect: move ssh command line preparation to a separate functionMike Hommey, May 17, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.