From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 03 May 2016 17:33:24 GMT
Subject: Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line
Message-ID: <CAPig+cTTeJf+ACfJ8yDj3tbiwUEhcjgn=MiDkzgDk7sYu4FA+w@mail.gmail.com>
In-Reply-To: <1462265452-32360-10-git-send-email-mh@glandium.org>

On Tue, May 3, 2016 at 4:50 AM, Mike Hommey <mh@glandium.org> wrote:
> While it is not strictly necessary, it makes the connect code simpler
> when there is user.
>
> Signed-off-by: Mike Hommey <mh@glandium.org>
> ---
> diff --git a/connect.c b/connect.c
> @@ -812,14 +812,10 @@ struct child_process *git_connect(int fd[2], const char *url,
>                         if (user) {
> -                               struct strbuf userandhost = STRBUF_INIT;
> -                               strbuf_addstr(&userandhost, user);
> -                               strbuf_addch(&userandhost, '@');
> -                               strbuf_addstr(&userandhost, host);
> -                               argv_array_push(&conn->args, userandhost.buf);
> -                               strbuf_release(&userandhost);
> -                       } else
> -                               argv_array_push(&conn->args, host);
> +                               argv_array_push(&conn->args, "-l");
> +                               argv_array_push(&conn->args, user);
> +                       }
> +                       argv_array_push(&conn->args, host);

Even simpler would be a one-liner for the user case:

    if (user)
        argv_array_pushf(&conn->args, "%s@%s"", user, host);
    else
        argv_array_push(&conn->args, host);

>                 } else {
>                         transport_check_allowed("file");
>                 }