Date: Sat, 4 Aug 2018 18:28:13 -0700 From: Ben Widawsky <bwidawsk@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Eitan Adler <lists@eitanadler.com>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r337157 - in head: . tools/tools/git Message-ID: <20180805012813.otoixfzbq4arecyi@smtp.freebsd.org> In-Reply-To: <CANCZdfrR7Ogb1ViGno%2BUXmDzYaV7dd8CmQ5L3w3bjmv%2BnH8kPA@mail.gmail.com> References: <201808021828.w72IS2ts055984@repo.freebsd.org> <CAF6rxgkF1zJJrg_xO1c1Jf81erPKTzLdS9PgTZhh1cWuhk5JiQ@mail.gmail.com> <CANCZdfqyxTpiyPhRS9CLCR2vaupGreahifpAL33Rx1RjN2Gpsw@mail.gmail.com> <CAF6rxg=jvSVnoP8qZcEU47RnP4ecZ0%2Bv9QJWzjLNc%2BhApaCMyA@mail.gmail.com> <CANCZdfrR7Ogb1ViGno%2BUXmDzYaV7dd8CmQ5L3w3bjmv%2BnH8kPA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 18-08-04 19:36:11, Warner Losh wrote:
>
>
> On Sat, Aug 4, 2018, 7:11 PM Eitan Adler <lists@eitanadler.com> wrote:
>
> On Sat, 4 Aug 2018 at 10:16, Warner Losh <imp@bsdimp.com> wrote:
> >
> >
> >
> > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler <lists@eitanadler.com> wrote:
> >>
> >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky <bwidawsk@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
>
LGTM. Thanks. To me, --force is a little more advanced usage, but I agree this
is a more direct approach. Would one of you mind updating the wiki so that the
two sources match (maybe also have the wiki point to this script)? I am
currently unable to register for a wiki account.
I've added you both as reviewers:
https://reviews.freebsd.org/D16593
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180805012813.otoixfzbq4arecyi>