Re: [PATCH 03/11] push: reorganize setup_push_simple()

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 28, 2021, 21:27 UTC
Message-ID: <60b1604b66329_2a3717208eb@natae.notmuch>
In-Reply-To: <CABPp-BFPXWy0GwZwT0weNs1DKMKFC4ds2tLJWcVQBOKxPMomFQ@mail.gmail.com>

Elijah Newren wrote:

Show 10 quoted lines

> On Fri, May 28, 2021 at 1:10 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
> >
> > Simply move the code around.
> 
> Not quite, you also deleted dead code.  Made the patch a bit harder to
> read because I was trying to verify you did what the commit message
> said and it took me longer than it should have to realize that you
> were also deleting dead code.  Might be worth including that fact in
> this sentence here.

OK. I thought that was obvious.

Shall I update the commit message to include that fact, or shall I add a separate patch to remove the dead code?

Either are fine by me.

Show 10 quoted lines

> > -               if (triangular)
> > -                       die(_("You are pushing to remote '%s', which is not the upstream of\n"
> > -                             "your current branch '%s', without telling me what to push\n"
> > -                             "to update which remote branch."),
> > -                           remote->name, branch->name);
> 
> This if-block is safe to delete because we're already in the !triangular case.
> 
> > -
> > -               if (1) {

Techically this is removing dead code too.

-- 
Felipe Contreras