[PATCH v6 7/9] connect: change the --diag-url output to separate user and host

[Mike Hommey]

Signed-off-by: Mike Hommey <m...@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 2659b40..dcaf32f 100644
--- a/connect.c
+++ b/connect.c
@@ -720,10 +720,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.2.411.ga570dec.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html