From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, tboegi@web.de
Subject: [PATCH v7 7/9] connect: change the --diag-url output to separate user and host
Date: Sun, 22 May 2016 08:17:30 +0900 [thread overview]
Message-ID: <20160521231732.4888-8-mh@glandium.org> (raw)
In-Reply-To: <20160521231732.4888-1-mh@glandium.org>
Signed-off-by: Mike Hommey <mh@glandium.org>
---
connect.c | 6 ++----
t/t5500-fetch-pack.sh | 14 ++++++++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/connect.c b/connect.c
index 48d9cd2..52d34c7 100644
--- a/connect.c
+++ b/connect.c
@@ -710,10 +710,8 @@ struct child_process *git_connect(int fd[2], const char *url,
if (flags & CONNECT_DIAG_URL) {
printf("Diag: url=%s\n", url ? url : "NULL");
printf("Diag: protocol=%s\n", prot_name(protocol));
- if (user)
- printf("Diag: userandhost=%s@%s\n", user, host);
- else
- printf("Diag: userandhost=%s\n", host ? host : "NULL");
+ printf("Diag: user=%s\n", user ? user : "NULL");
+ printf("Diag: host=%s\n", host ? host : "NULL");
printf("Diag: port=%s\n", port ? port : "NONE");
printf("Diag: path=%s\n", path ? path : "NULL");
conn = NULL;
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 739c6b1..2d9c4be 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -553,7 +553,7 @@ check_prot_path () {
Diag: protocol=$2
Diag: path=$3
EOF
- git fetch-pack --diag-url "$1" | egrep -v '(host|port)=' >actual &&
+ git fetch-pack --diag-url "$1" | egrep -v "(user|host|port)=" >actual &&
test_cmp expected actual
}
@@ -568,10 +568,20 @@ check_prot_host_port_path () {
;;
esac
ehost=$(echo $3 | tr -d "[]")
+ case "$ehost" in
+ *@*)
+ user=${ehost%@*}
+ ehost=${ehost#$user@}
+ ;;
+ *)
+ user=NULL
+ ;;
+ esac
cat >exp <<-EOF &&
Diag: url=$1
Diag: protocol=$pp
- Diag: userandhost=$ehost
+ Diag: user=$user
+ Diag: host=$ehost
Diag: port=$4
Diag: path=$5
EOF
--
2.8.3.401.ga81c606.dirty
next prev parent reply other threads:[~2016-05-21 23:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-21 23:17 [PATCH v7 0/9] connect: various cleanups Mike Hommey
2016-05-21 23:17 ` [PATCH v7 1/9] connect: document why we sometimes call get_port after get_host_and_port Mike Hommey
2016-05-22 2:40 ` Eric Sunshine
2016-05-22 6:07 ` Torsten Bögershausen
2016-05-22 8:03 ` Mike Hommey
2016-05-23 4:31 ` Torsten Bögershausen
2016-05-23 21:30 ` Junio C Hamano
2016-05-23 21:50 ` Mike Hommey
2016-05-24 4:44 ` Torsten Bögershausen
2016-05-25 23:34 ` Mike Hommey
2016-05-26 5:35 ` Torsten Bögershausen
2016-05-21 23:17 ` [PATCH v7 2/9] connect: call get_host_and_port() earlier Mike Hommey
2016-05-21 23:17 ` [PATCH v7 3/9] connect: re-derive a host:port string from the separate host and port variables Mike Hommey
2016-05-21 23:17 ` [PATCH v7 4/9] connect: make parse_connect_url() return separated host and port Mike Hommey
2016-05-21 23:17 ` [PATCH v7 5/9] connect: group CONNECT_DIAG_URL handling code Mike Hommey
2016-05-21 23:17 ` [PATCH v7 6/9] connect: make parse_connect_url() return the user part of the url as a separate value Mike Hommey
2016-05-21 23:17 ` Mike Hommey [this message]
2016-05-21 23:17 ` [PATCH v7 8/9] connect: actively reject git:// urls with a user part Mike Hommey
2016-05-21 23:17 ` [PATCH v7 9/9] connect: move ssh command line preparation to a separate function Mike Hommey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160521231732.4888-8-mh@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).