Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Aug 2018 11:10:39 -0700
From:      Eitan Adler <lists@eitanadler.com>
To:        Warner Losh <imp@bsdimp.com>
Cc:        bwidawsk@freebsd.org, 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:  <CAF6rxg=jvSVnoP8qZcEU47RnP4ecZ0%2Bv9QJWzjLNc%2BhApaCMyA@mail.gmail.com>
In-Reply-To: <CANCZdfqyxTpiyPhRS9CLCR2vaupGreahifpAL33Rx1RjN2Gpsw@mail.gmail.com>
References:  <201808021828.w72IS2ts055984@repo.freebsd.org> <CAF6rxgkF1zJJrg_xO1c1Jf81erPKTzLdS9PgTZhh1cWuhk5JiQ@mail.gmail.com> <CANCZdfqyxTpiyPhRS9CLCR2vaupGreahifpAL33Rx1RjN2Gpsw@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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.


--
Eitan Adler



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxg=jvSVnoP8qZcEU47RnP4ecZ0%2Bv9QJWzjLNc%2BhApaCMyA>