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

2018-08-04 Thread Ben Widawsky
On 18-08-04 19:36:11, Warner Losh wrote: > > > On Sat, Aug 4, 2018, 7:11 PM Eitan Adler wrote: > > On Sat, 4 Aug 2018 at 10:16, Warner Losh wrote: > > > > > > > > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler wrote: > >> > >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky

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

2018-08-04 Thread Warner Losh
On Sat, Aug 4, 2018, 7:11 PM Eitan Adler wrote: > On Sat, 4 Aug 2018 at 10:16, Warner Losh wrote: > > > > > > > > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler wrote: > >> > >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky wrote: > >> > +git_checkout() > >> > +{ > >> > + # Delete master > >> > +

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

2018-08-04 Thread Eitan Adler
On Sat, 4 Aug 2018 at 10:16, Warner Losh wrote: > > > > On Sat, Aug 4, 2018, 6:08 PM Eitan Adler wrote: >> >> On Thu, 2 Aug 2018 at 11:28, Ben Widawsky wrote: >> > +git_checkout() >> > +{ >> > + # Delete master >> > + ${GIT} branch -D master >> > + >> > + # Make master really

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

2018-08-04 Thread Warner Losh
On Sat, Aug 4, 2018, 6:08 PM Eitan Adler wrote: > On Thu, 2 Aug 2018 at 11:28, Ben Widawsky wrote: > > +git_checkout() > > +{ > > + # Delete master > > + ${GIT} branch -D master > > + > > + # Make master really be trunk > > + ${GIT} checkout -b master trunk > > Can't

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

2018-08-04 Thread Eitan Adler
On Thu, 2 Aug 2018 at 11:28, Ben Widawsky 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 ? -- Eitan Adler

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

2018-08-02 Thread Ben Widawsky
Author: bwidawsk Date: Thu Aug 2 18:28:02 2018 New Revision: 337157 URL: https://svnweb.freebsd.org/changeset/base/337157 Log: tools: Add a git-svn bootstrap script codified version of https://wiki.freebsd.org/GitWorkflow/GitSvn#Using_git-svn Approved by: emaste (mentor) Suggested