=== Git Migration Working Group

Links: +
link:https://wiki.freebsd.org/Git[Git for FreeBSD development wiki] URL: link:https://wiki.freebsd.org/Git[https://wiki.freebsd.org/Git] +
link:https://wiki.freebsd.org/GitTransition[Git transition wiki] URL: link:https://wiki.freebsd.org/GitTransition[https://wiki.freebsd.org/GitTransition] +
link:https://cgit.FreeBSD.org/doc[doc git repo web] URL: link:https://cgit.FreeBSD.org/doc[https://cgit.FreeBSD.org/doc] +
link:https://cgit.FreeBSD.org/ports[ports git repo web] URL: https://cgit.FreeBSD.org/ports[https://cgit.FreeBSD.org/ports] +
link:https://cgit.FreeBSD.org/src[src (base system) git repo web] URL: link:https://cgit.FreeBSD.org/src[https://cgit.FreeBSD.org/src] +
link:https://docs.freebsd.org/en/articles/committers-guide/#git-primer[Committers guide Git primer] URL: link:https://docs.freebsd.org/en/articles/committers-guide/#git-primer[https://docs.freebsd.org/en/articles/committers-guide/#git-primer] +
link:https://docs.freebsd.org/en/books/handbook/mirrors/#git[Handbook Using Git appendix] URL: link:https://docs.freebsd.org/en/books/handbook/mirrors/#git[https://docs.freebsd.org/en/books/handbook/mirrors/#git] +
link:http://gameoftrees.org/[Game of Trees] URL: link:http://gameoftrees.org/[http://gameoftrees.org/] +
link:https://github.com/johnmehr/gitup[gitup] URL: link:https://github.com/johnmehr/gitup[https://github.com/johnmehr/gitup]

Contact: Li-Wen Hsu <lwhsu@FreeBSD.org> +
Contact: Warner Losh <imp@FreeBSD.org> +
Contact: Ed Maste <emaste@FreeBSD.org> +
Contact: link:https://lists.freebsd.org/mailman/listinfo/freebsd-git[FreeBSD-git mailing list] +
Contact: #gitcvt channel on EFnet

With the end of the third quarter of 2021, we are approaching the one-year anniversary of the transition of the doc and src repositories from Subversion to Git.  The 2021Q4 branch of the ports tree has been created, the third quarterly branch created using Git.

During 2021Q3, repository hooks have been refined as problems were discovered and a few lingering references to Subversion were updated in the Committer's Guide.  The Working Group continues to track progress on two permissively-licensed Git-compatible tools: Gitup and Game of Trees. Gitup is a small, dependency-free tool to clone and update git repositories. It is used only to keep a local tree up-to-date, and has no support for local commits.  Game of Trees is a version control client that is compatible with Git repositories.  It provides a user interface and workflow that is distinct from that of Git.  It is in no way intended to be a drop-in replacement for Git, but can be used to develop software maintained in a Git repository.

link:https://www.freshports.org/net/gitup[Gitup] and link:https://www.freshports.org/devel/got[Game of Trees] are currently available as ports and packages.
Future work will evaluate them as candidates for the base system.

Remaining work includes continuing with refinements to Git documentation in the Handbook, committing new and updated repository hooks for managing branch content and commit mail, and surveying pre-commit hooks to use the CI cluster to build release artifacts.  Priorities have been set for the next working group tasked with refining our Git workflow.  The first meeting will be in mid-October.

Sponsor: The FreeBSD Foundation (in part)