svn commit: r337157 - in head: . tools/tools/git

[Warner Losh]

On Sat, Aug 4, 2018, 7:11 PM Eitan Adler <lists at eitanadler.com> wrote:

> On Sat, 4 Aug 2018 at 10:16, Warner Losh <imp at bsdimp.com> wrote:
> >
> >
> >
> > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler <lists at eitanadler.com> wrote:
> >>
> >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky <bwidawsk at freebsd.org> wrote:
> >> > +git_checkout()
> >> > +{
> >> > +       # Delete master
> >> > +       ${GIT} branch -D master
> >> > +
> >> > +       # Make master really be trunk
> >> > +       ${GIT} checkout -b master trunk
> >>
> >> Can't this be git branch --force master trunk ?
> >
> >
> > No. That won't work. We do not want to change the location of master.
> This will reset it to trunk, which is nearly always wrong.
>
> See this:
>
> ${GIT} branch -D master
> ${GIT} checkout -b master trunk
>
> For clarity I'd expect something closer to:
>
> git branch --force master trunk
> git checkout master
>
> The end result is the same, but IMHO this is clearer in intent.
>

Oh, that... yes, you may be right. There is another script that it would be
wrong in, but not this one...

Warner

>