From owner-freebsd-git@freebsd.org Thu Jun 25 13:50:30 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6126E35B61B for ; Thu, 25 Jun 2020 13:50:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t1cQ21Cnz4608; Thu, 25 Jun 2020 13:50:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 238492B9B5; Thu, 25 Jun 2020 13:50:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [10.10.156.45] (unknown [45.85.81.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3D1876DE68; Thu, 25 Jun 2020 15:50:28 +0200 (CEST) From: Dimitry Andric Message-Id: <3DDCE53A-3B0D-4B0A-8F8B-9C42F4935457@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.14\)) Subject: Re: svn primer translation to git Date: Thu, 25 Jun 2020 15:50:21 +0200 In-Reply-To: <20200625132606.GB32126@kib.kiev.ua> Cc: Ed Maste , freebsd-git@freebsd.org To: Konstantin Belousov References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <20200625132606.GB32126@kib.kiev.ua> X-Mailer: Apple Mail (2.3445.104.14) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 13:50:30 -0000 --Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 25 Jun 2020, at 15:26, Konstantin Belousov wrote: > > On Thu, Jun 25, 2020 at 09:05:51AM -0400, Ed Maste wrote: >> On Thu, 25 Jun 2020 at 08:56, Renato Botelho wrote: >>> >>> Based on what I saw in other projects when people moved to git, a common >>> mistake that happens is people abusing `git pull` and creating merges >>> where it's not desired, like in main branch when bringing remote changes >>> to local modified repository. Maybe it's worth to add a paragraph >>> saying some words about always use rebase instead of merge. >> >> Indeed - I started touching on that at the beginning, but we need to >> make that clear in the day-to-day use example. Probably a broad "never >> use git pull" warning too. > > Isn't it a common (and necessary) practice to disable push of merge > commits and non-ff pushes for master branch of centralized repository, > by commit hooks ? Does the prototype repo enforce such policy ? That is indeed a requirement, as is the disabling of force-pushing. GitHub and GitLab have simple controls in their UIs for this, to protect one or more branches against such actions. -Dimitry --Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXvSrnQAKCRCwXqMKLiCW oyEkAKCvF1Ch2LPVK3GlN0z+2S67oAyl4ACgvzUocupPjVXJFtrE5AXoHXmduXY= =u3Nt -----END PGP SIGNATURE----- --Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E--