From: Mike Hommey <mh@glandium.org>
Date: Tue, 03 May 2016 22:52:48 GMT
Subject: Re: [PATCH v4 09/11] connect: use "-l user" instead of "user@" on ssh command line
Message-ID: <20160503225248.GC21973@glandium.org>
In-Reply-To: <CAPig+cTTeJf+ACfJ8yDj3tbiwUEhcjgn=MiDkzgDk7sYu4FA+w@mail.gmail.com>

On Tue, May 03, 2016 at 01:33:24PM -0400, Eric Sunshine wrote:
> 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);

Oh, I should have read the argv-array.h header. Thanks.

Mike