From owner-freebsd-git@freebsd.org Sun Jun 21 22:14:25 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 E7622336D3B for ; Sun, 21 Jun 2020 22:14:25 +0000 (UTC) (envelope-from dan@langille.org) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49qmzh6XK3z3Vdj for ; Sun, 21 Jun 2020 22:14:24 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 0E51A5C12BC for ; Sun, 21 Jun 2020 18:14:23 -0400 (EDT) Received: from imap36 ([10.202.2.86]) by compute2.internal (MEProxy); Sun, 21 Jun 2020 18:14:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:date:from:to:subject:content-type :content-transfer-encoding; s=fm1; bh=bQFtJyx+Oa/iY/9Wn1kSXl2EfU o61XWG/9cdIXr829g=; b=KFxXe6tPIeusdNPpvDQJcWpwVkO7s0lA+g+o3lABXu VnuyhAEj99Vc/vpd6oZCXlh94vVmnCE+QX0/DR15A3Q4yNEavqCDDNgSpFc/Ih/v 1cY9v+AJBBwSpdKfDC05bjPGYX0Mc6qcApgJ7FsvzYeDiN2PpqFuZ4ZMm6xfqUJM wWloAjU27fQWF5c05Fwap1hyC14ZLLVI307m6X6v2O3nOv2CSZW9Gh8QobFOSG1u TsTG96B91C9n0n/KdySBeYQ01kF0H9atl1PEkxw/TWzJrvA0enj/pj9j3Ozr6h2U k0uVk+wAFfhOcg0e9NHEv3o3pjfBHWOwp4y7eHSH/qvw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=bQFtJy x+Oa/iY/9Wn1kSXl2EfUo61XWG/9cdIXr829g=; b=qjLTwLSOJ9IkB9lrv+1tu8 W/l5Gm9bphcXfAcRzU1yatjP05HPl1OqutoHRK+eb/OfPuvZqxV564Vqw13Ss79/ BX4IAbhfr/CMukIQz2NhfrD1dpVY+WfyeZ7DGxf6zOJdEKGWHLG1PP5LzCb1+gaJ b82MaC/K3da4wUGHJIApDYHxVkYBekzMImZp44Z+5Grit2HTLsbYyqnn9bCx3gxT jrCYoknPt7oodQZXnckGYHds1ckNgRsZHJRIPAOuolAQyj9Ob7DUZPQMcuXHth0o HoywbWZ91YRShU3Qdh9qiaWfNTdCrP3NPjcF1P/LhC0lfcjx41kQuw5Xr64EPulQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudekuddgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfffhffvufgtgfesthhqre dtreerjeenucfhrhhomhepfdffrghnucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhg ihhllhgvrdhorhhgqeenucggtffrrghtthgvrhhnpefgffdtvdduteejvdelgeetheevue dtjeevieegveetleetgfduhffhfeelgffhffenucffohhmrghinhepfhhrvghshhhpohhr thhsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 993671880093; Sun, 21 Jun 2020 18:14:22 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-dev0-543-gda70334-fm-20200618.004-gda703345 Mime-Version: 1.0 Message-Id: Date: Sun, 21 Jun 2020 18:14:02 -0400 From: "Dan Langille" To: freebsd-git@freebsd.org Subject: git-based FreshPorts Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49qmzh6XK3z3Vdj X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm1 header.b=KFxXe6tP; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=qjLTwLSO; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.29 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.35 / 15.00]; XM_UA_NO_VERSION(0.01)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.29:from]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.29]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.19)[-1.186]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.29:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.010]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm1,messagingengine.com:s=fm3]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.06)[-1.061]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; MID_RHS_WWW(0.50)[] 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: Sun, 21 Jun 2020 22:14:26 -0000 Hello, Work on the git-based version of FreshPorts has restarted. The initial FreshPorts work for git started in September, then was aband= oned for unknown reasons. It just fell off the RADAR. This week, it came= back to my attention. Today, I created new new FreeBSD jails for this work: * devgit-ingress01 =E2=80=93 for processing of incoming FreeBSD commits * devgit-nginx01 =E2=80=93 for displaying those commits More detail at https://news.freshports.org/2020/06/21/git-the-next-fresh= ports-project/ Thank you --=20 Dan Langille dan@langille.org From owner-freebsd-git@freebsd.org Sun Jun 21 22:21:22 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 6DDF533718B for ; Sun, 21 Jun 2020 22:21:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49qn7j3x1bz3W7c for ; Sun, 21 Jun 2020 22:21:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id w1so13953078qkw.5 for ; Sun, 21 Jun 2020 15:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=P8eSmiZYtDv8a4YlMI89+Idlr9k76/iiZ+PYRY8j/+8=; b=lINHnP/pI4+QLtusM8PSE+mlDpl2KqaElg8H9ftLLbnRMcOMh1j3yYSePNZF8TIJqR WuChrrorbL7uaou7FMLnQrc+3jEMfXO1UKG0rfZOwjROxk+06xkZSUNUcvPaXCU6lZvx JXLz6ZQRG5m+XMb06zVrhyfhQqTMDljCQJ+fSwT/5RpnYBTnK9joyf1OwtEWYry1c8KJ RbXoXT04B9s1jBrmzjxHej1H8DgJ0LopLopL+9aec8GRU5RtuJFg37LFi+s3kuYw+r+o aKLNJC1/a+XQJWQplPFLSn57H3tun/1O/ij4t20Sj0RRrC8mTyvHX9J+Fg/H7rNN6wPk +IAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=P8eSmiZYtDv8a4YlMI89+Idlr9k76/iiZ+PYRY8j/+8=; b=pZk6zW+8O3bh+7PBemllh4NoH3IM6/NLKO+69ENhAjRRiRG0rIawnZO+BoN+s6vGMC ymssy3NI8/DTXpO7mejNckfY+ymmuWm2qE6E/qNBdcmjg1VaixQJ0Z5S6Wx0cf9fYBnt 3XkyE4ZuzI637/YaYnVwgmwmf85zBH12SxM6O8xzkIXXQU10BFbXrKvGh0JOnXH3OsW4 hC5K+dT4jwxUgwZKTNhgzDMPRKEdDThSw/TTQ4lNJThoVZeO4OesVjBvAE+lgoStaOQM HaOODxi5cfnCHo2lPMOlWDWOaA8YLQxeklPT6ceJnKvhuYT27ItvvBW+rsrTtU6LDR/6 h8DA== X-Gm-Message-State: AOAM53336h91NTu8Nq+CdojisN078e/uVwHpB+u5xLouTAjaxCV/bgyV S71kKHEOoKAiBHhs21lkAr1nBQBqJfGkzODdD27aZ0IRME8= X-Google-Smtp-Source: ABdhPJxzxovVlak3a+dHaCVyzLtvqejEuBIj2bEk7bXhZIfLbg619eCZN+hUllcLJSHkoEz8UEdWsUJ1rKXIgdihFwQ= X-Received: by 2002:a05:620a:9d8:: with SMTP id y24mr13305014qky.60.1592778080674; Sun, 21 Jun 2020 15:21:20 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 21 Jun 2020 16:21:08 -0600 Message-ID: Subject: Re: git-based FreshPorts To: Dan Langille Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49qn7j3x1bz3W7c X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=lINHnP/p; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.70 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.01)[-1.010]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.81)[-0.805]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; NEURAL_HAM_SHORT(-0.89)[-0.890]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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: Sun, 21 Jun 2020 22:21:22 -0000 This sounds great Dan. Thanks for the update. Please let us know if you have any problems with our setup. Warner On Sun, Jun 21, 2020, 4:14 PM Dan Langille wrote: > Hello, > > Work on the git-based version of FreshPorts has restarted. > > The initial FreshPorts work for git started in September, then was > abandoned for unknown reasons. It just fell off the RADAR. This week, it > came back to my attention. > > Today, I created new new FreeBSD jails for this work: > > * devgit-ingress01 =E2=80=93 for processing of incoming FreeBSD commits > * devgit-nginx01 =E2=80=93 for displaying those commits > > More detail at > https://news.freshports.org/2020/06/21/git-the-next-freshports-project/ > > Thank you > > -- > Dan Langille > dan@langille.org > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Wed Jun 24 16:34:48 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 31C70352846 for ; Wed, 24 Jun 2020 16:34:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sTJR1sJDz4MVM for ; Wed, 24 Jun 2020 16:34:47 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f42.google.com with SMTP id c16so2830324ioi.9 for ; Wed, 24 Jun 2020 09:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=uz/HwnKLNqaaLu/bp9PO9cdrdF4WXNMMH92/pkYIvKo=; b=rvDs0GjkxkPVJdE7kkJvrt8kOeRszP9VN0SUV12q08DZ04ZSpYl50LV9SqmqJ6WWO1 j2Q/tKfObGXyiTA9psLgB9Dn/JvcT/SobIGaUNKUNT84VTUowy0NcPw4lci8fNeZwoKJ u88G4Uea6mjVZdJIjaIojO9LsWycvIO29IhVYuUpvk15JayYNpW+8Nd15v64+3gyz6Yw B81UkPq7oI9groc4dc+xD52DKvPNevu5tOFpqct8b7cJZbhSMjvx6r/lOSxx6E9yGo4E dPtuxHfABxonI+ZYtdHrspBTEU6aKAoA3OxqR7jLAO6P8XkdAMJLZARIdiY3pinfPVCN lDvQ== X-Gm-Message-State: AOAM531jmOkVrQs5OMQMhSaQ7uKxUXIJx69XkSWDV+qITgxhoPbmJBGT VyWl1dqFhvGZQLMzxmE/Gs3kU+PmwqyF1MQmzex/sxog X-Google-Smtp-Source: ABdhPJy8Y/mzMN7qNBMGS0/PAniAKBnf4qnVgNZnN2R1MWiR5KhfkYU6XMNUVQHW37S1V9FiCT8VXlfoYJydC8FAYNI= X-Received: by 2002:a6b:b252:: with SMTP id b79mr32685374iof.31.1593016484652; Wed, 24 Jun 2020 09:34:44 -0700 (PDT) MIME-Version: 1.0 From: Ed Maste Date: Wed, 24 Jun 2020 12:34:33 -0400 Message-ID: Subject: svn primer translation to git To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49sTJR1sJDz4MVM X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.42 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-0.35 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.22)[-0.222]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.38)[-0.383]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(0.26)[0.258]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.42:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.42:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[] 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: Wed, 24 Jun 2020 16:34:48 -0000 We currently have a FreeBSD Subversion primer in the committer's guide: https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html I've started a translation of this into a Git primer, at: https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view I'm particularly interested in feedback on how much git background / theory of operation we want to include here (vs referring to external documentation). From owner-freebsd-git@freebsd.org Wed Jun 24 18:15:03 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 ACBB3340074 for ; Wed, 24 Jun 2020 18:15:03 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sWX72ztHz3gJZ; Wed, 24 Jun 2020 18:15:03 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 1474BEBB1; Wed, 24 Jun 2020 18:15:03 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Wed, 24 Jun 2020 18:15:00 +0000 From: Glen Barber To: Ed Maste Cc: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200624181500.GW61041@FreeBSD.org> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="NUQP2JP/Zo+En7Or" Content-Disposition: inline In-Reply-To: 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: Wed, 24 Jun 2020 18:15:03 -0000 --NUQP2JP/Zo+En7Or Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jun 24, 2020 at 12:34:33PM -0400, Ed Maste wrote: > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view >=20 Thank you for doing this. Glen --NUQP2JP/Zo+En7Or Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl7zmCAACgkQAxRYpUeP 4pPU+A//XPyJekYpDru0rS9Fx1HCsMkYdqh6f59HcBm2TQGL3f0Thl6wRXyNz5Fv NujzTg/Trna9PcxEDGcx6JON2H8IvMfwJEnhrhD6DnP/KcQpmq/wFQCkkgpvQ+b4 AZVQXDlhCapkYND+07vAlXky0a6aVaO9Mm5bLOBPHTuq1GKPqsE/dK/R5oycdSog /9KBK5hTU1Dd8BNbB84MghgDWbqioDcYTu1sCYetIdeQtqFnotHHm0lDat9quob8 37OBpgJs7czvCfcz5YeOwpAHgitn//o0OdaWYwE1dR04IztKczpB95cRiNJnW7tg aVmFUEp8du2ETTG98aK8WIqUCp/7j/GlaFrjKMTCO31IK/NPsIrhilTXsv3Pma4m oVrbeGlhUofD5hdZiL3LTU/zcuesv7wO4gTNog/EsVJKcRxxaa/Y15XgoFLmHwzE ueebcfRDjpiO3SB604eIHxOcHeEhfLlClmS6Ia+1lrrrHA5d6/hs8x7NKWM7iQJM qiHzbJf2LCQ8B32XHD4jeX1RvMgzTQfmlJOf5+iZNX5FC6LyaaOPSp+in95SufC2 RFYK+jS/qbNgl9NPKpeGVfpkm5sCMt4FhPA68BFJnwTAB8PnASvOuAaB3LwpKJcH NdkqRaEXgef55wIczlgHlNJ+wbCSk+Q2zBAHm/ahqS4cz2f7NhE= =G+94 -----END PGP SIGNATURE----- --NUQP2JP/Zo+En7Or-- From owner-freebsd-git@freebsd.org Thu Jun 25 06:24:58 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 94B2C352D15 for ; Thu, 25 Jun 2020 06:24:58 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 49sqkL3R4zz4fm2; Thu, 25 Jun 2020 06:24:58 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from beaver (unknown [IPv6:2a02:169:175:0:12bf:48ff:fee1:88e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: ehaupt) by smtp.freebsd.org (Postfix) with ESMTPSA id E93DD2868F; Thu, 25 Jun 2020 06:24:57 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Date: Thu, 25 Jun 2020 08:24:55 +0200 From: Emanuel Haupt To: Ed Maste Cc: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-Id: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> In-Reply-To: References: X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 06:24:58 -0000 Ed Maste wrote: > We currently have a FreeBSD Subversion primer in the committer's > guide: > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view > > I'm particularly interested in feedback on how much git background / > theory of operation we want to include here (vs referring to external > documentation). Thank you for writing the document. Maybe we could address the convention [1] that with git commit messages usually begin with a subject, followed by a blank line and then the commit body. This schema produces beautiful commit logs on web-based DevOps lifecycle tools such as github, gitlab, gitea. I further recommend this [2] article on the subject. Emanuel [1] https://git-scm.com/docs/git-commit#_discussion [2] https://chris.beams.io/posts/git-commit/ From owner-freebsd-git@freebsd.org Thu Jun 25 07:09:13 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 4CA7A3539C7 for ; Thu, 25 Jun 2020 07:09:13 +0000 (UTC) (envelope-from kp@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 49srjP1JJrz3T1c; Thu, 25 Jun 2020 07:09:13 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id D5EE6287B6; Thu, 25 Jun 2020 07:09:12 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id E897C341D1; Thu, 25 Jun 2020 09:09:10 +0200 (CEST) From: "Kristof Provost" To: "Emanuel Haupt" Cc: "Ed Maste" , freebsd-git@freebsd.org Subject: Re: svn primer translation to git Date: Thu, 25 Jun 2020 09:09:10 +0200 X-Mailer: MailMate (1.13.1r5671) Message-ID: In-Reply-To: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 07:09:13 -0000 On 25 Jun 2020, at 8:24, Emanuel Haupt wrote: > Ed Maste wrote: >> We currently have a FreeBSD Subversion primer in the committer's >> guide: >> https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/= subversion-primer.html >> >> I've started a translation of this into a Git primer, at: >> https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view >> >> I'm particularly interested in feedback on how much git background / >> theory of operation we want to include here (vs referring to external >> documentation). > > Thank you for writing the document. > > Maybe we could address the convention [1] that with git commit = > messages > usually begin with a subject, followed by a blank line and then the > commit body. > > This schema produces beautiful commit logs on web-based DevOps = > lifecycle > tools such as github, gitlab, gitea. > That=E2=80=99s a good point. Most of our commit messages already follow this form, so it shouldn=E2=80= =99t = be a painful adjustment. I=E2=80=99ve had a look at the last few commits, and only the MFCs stand = out = as needing a little attention in that area. To grab a random example: MFC r362183 netmap: vtnet: fix races in vtnet_netmap_reg() The nm_register callback needs to call nm_set_native_flags() or nm_clear_native_flags() once the device has been stopped. However, in the current implementation this is not true, as the device is stopped by vtnet_init_locked(). This causes race conditions where the driver crashes as soon as it dequeues netmap buffers assuming they are mbufs (or the other way around). To fix the issue, we extend vtnet_init_locked() with a second argument that, if not zero, will set/clear the netmap flags. This results in a huge simplification of the nm_register callback itself. Also, use netmap_reset() to check if a ring is going to be re-initialized in netmap mode. The original commit already followed the =E2=80=98headline summary, expan= ded = body=E2=80=99 rule. This MFC would also work (often there=E2=80=99s no bl= ank line = between the =E2=80=98MFC=E2=80=99 and the next line), but I do wonder if = `MFC = r362183: netmap: vtnet: fix races in vtnet_netmap_reg()` wouldn=E2=80=99t= be = better. It=E2=80=99s a minor point, but we may as well document a choice now. I h= ave = my preferences, but most of all I=E2=80=99d prefer uniformity. Best regards, Kristof From owner-freebsd-git@freebsd.org Thu Jun 25 09:13:34 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 C7E3B356041 for ; Thu, 25 Jun 2020 09:13:34 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49svSs2Nvjz3ZF1; Thu, 25 Jun 2020 09:13:33 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id p20so5166971ejd.13; Thu, 25 Jun 2020 02:13:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=nyllCAIS5Hs1/L0pjS0+UBe49lgzo7b/cz0et6CmnbQ=; b=tnlxG7xFDSqNI4kWhRC6YTlyZ7JxDWtIePvNmEsg64QDXqTVMYijC8EC2JlBF/fpm3 /STFV59UqLjxPUxrojIezKR0W4Gb59UlEecBPnLTFBVzPZZIUolmCKovLDAL6ZhjaCGA QFZa7phZgUDrg+eq5dNQGsrTY5d9SZYBsGv3BzH1rvj067iJR2zPfEZru86tPvjjaOQN L8vuXTGMR6/7HnGoXxfsWXA/B14xb2Cvm29eU6CS63tB/hU17MJKal36wIdJEOBn4JOv 3FEmgnlCHqc1Q6oRBvbu+OhS/ERYgfiwQ5MIEAsTPSAAWvE3Nc0uuYQsn7LMR55KCkEp 1/CQ== X-Gm-Message-State: AOAM531A5oMdi0+1ifHcHJyPq/XlnW/lbI8KAlhuFowXNpOM5ZcPMCwL nvYuiYHZWO4enzH4ZrJKYt57jH0Ocg4= X-Google-Smtp-Source: ABdhPJyuyvnRQI5ZzP6ZaGIURePf+rx2arjXUFtUrpJ15lP3KSE5CXBKbQ13qFZ/jrvlVfiJcA85gw== X-Received: by 2002:a17:906:af62:: with SMTP id os2mr28350729ejb.345.1593076411583; Thu, 25 Jun 2020 02:13:31 -0700 (PDT) Received: from ?IPv6:2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8? ([2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8]) by smtp.gmail.com with ESMTPSA id v11sm6686224eja.113.2020.06.25.02.13.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Jun 2020 02:13:30 -0700 (PDT) Subject: Re: svn primer translation to git To: Kristof Provost , Emanuel Haupt Cc: freebsd-git@freebsd.org References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-ID: Date: Thu, 25 Jun 2020 11:13:30 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 49svSs2Nvjz3ZF1 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-1.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-0.87)[-0.866]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.70)[-0.697]; NEURAL_HAM_SHORT(-0.33)[-0.335]; RCVD_IN_DNSWL_NONE(0.00)[209.85.218.47:from]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.218.47:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com] 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 09:13:34 -0000 On 6/25/20 9:09 AM, Kristof Provost wrote: > On 25 Jun 2020, at 8:24, Emanuel Haupt wrote: >> Ed Maste wrote: >>> We currently have a FreeBSD Subversion primer in the committer's >>> guide: >>> https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html >>> >>> >>> I've started a translation of this into a Git primer, at: >>> https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view >>> >>> I'm particularly interested in feedback on how much git background / >>> theory of operation we want to include here (vs referring to external >>> documentation). >> [...] > > I’ve had a look at the last few commits, and only the MFCs stand out as > needing a little attention in that area. > To grab a random example: > >       MFC r362183 > >       netmap: vtnet: fix races in vtnet_netmap_reg() > >       The nm_register callback needs to call nm_set_native_flags() >       or nm_clear_native_flags() once the device has been stopped. [...] > > The original commit already followed the ‘headline summary, expanded > body’ rule. This MFC would also work (often there’s no blank line > between the ‘MFC’ and the next line), but I do wonder if `MFC r362183: > netmap: vtnet: fix races in vtnet_netmap_reg()` wouldn’t be better. +1. And then if you're MFC'ing multiple commits at once, you'd just add a little title capturing the change as a whole? From owner-freebsd-git@freebsd.org Thu Jun 25 12:55:26 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 CF62535A8D8 for ; Thu, 25 Jun 2020 12:55:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t0Nt3S7Pz43S5; Thu, 25 Jun 2020 12:55:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f68.google.com with SMTP id m81so5918017ioa.1; Thu, 25 Jun 2020 05:55:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=5OMZSyj00bSyeJrL6crIv9DWAOiSmnVkJnppLQ7KsE4=; b=az6zN/545U1h5X9xOcjQuqCuL8GKsxG0hZN+YUeBdxQ2JJeim9+mf2iBk2g9Yf0cIx ouPM3RB2eZnAob4dukcL+GmlJ+P/duhV+aEeCvQBL/MhHtLAJR3rWj5UdaCzpaUUkoNg +OG4d2ZyOxzgDlkAm49tggPOR427owagReYG0H1CLHgfvo+Ku/FI7TajWsoAhakNfx5i /OsVJXsqq/ks6Fazg2Ake/QWtDicheYvWEgQGti7svYMNWEjfXPMyL3WPtoWT4oftOnB yTxbUihnqNat1j0qxv2JBVNtb3L69JKz6+3EfB+1CAZKjVAwkf817zfgImRZBp6VwoO3 YTOg== X-Gm-Message-State: AOAM533Ex4WezTbNpoMY8RKm/XQequ+dJqSdwU752g8UgnnxTJEO8ZQP vFd8XsBH7p/7KXS70fQ9oohG8WtK6A1QFw5iG72GoSW7 X-Google-Smtp-Source: ABdhPJw08kHhzomkolC8oE3blQE2BIYVmcTQVEJsyL6DxAPenpoprevB3bA9vk717PTdyg/6YqN9j5GtQ9YAX/V20zY= X-Received: by 2002:a02:908f:: with SMTP id x15mr3345142jaf.12.1593089723287; Thu, 25 Jun 2020 05:55:23 -0700 (PDT) MIME-Version: 1.0 References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Thu, 25 Jun 2020 08:55:10 -0400 Message-ID: Subject: Re: svn primer translation to git To: Kristof Provost Cc: Emanuel Haupt , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49t0Nt3S7Pz43S5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] 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 12:55:26 -0000 On Thu, 25 Jun 2020 at 03:09, Kristof Provost wrote: > > The original commit already followed the =E2=80=98headline summary, expan= ded body=E2=80=99 rule. This MFC would also work (often there=E2=80=99s no = blank line between the =E2=80=98MFC=E2=80=99 and the next line), but I do w= onder if MFC r362183: netmap: vtnet: fix races in vtnet_netmap_reg() wouldn= =E2=80=99t be better. I agree we need to choose and document an approach. There are examples of your proposed style already. I would suggest we go one step further though; the source revision is really metadata, and ought to be tracked by the tools in an automated or semi-automated way. The git equivalent for MFCs is `git cherry-pick`, and it has a -x flag to append the original commit hash. Let's say I wanted to MFC r362543 (91285bbdc146 in the current GitHub mirro= r): ``` commit 91285bbdc146fee00b83b8605e11aec19ed18b2a Author: emaste Date: Tue Jun 23 15:36:05 2020 +0000 ldconfig: remove i386 aout invocation aout support in ldconfig hasn't been required since FreeBSD 2.x. Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 ldconfig to generate aout ldconfig hints. Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 Notes: svn path=3D/head/; revision=3D362543 ``` To MFC this to a stable/12 worktree I could use ``` % git cherry-pick -x 91285bbdc146 ``` When I go to commit the default commit message is: ``` ldconfig: remove i386 aout invocation aout support in ldconfig hasn't been required since FreeBSD 2.x. Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 ldconfig to generate aout ldconfig hints. Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 (cherry picked from commit 91285bbdc146fee00b83b8605e11aec19ed18b2a) # Conflicts: # libexec/rc/rc.d/ldconfig ``` I think this is fine, and consistency will facilitate tooling for automating to answer questions like "what commits of mine have not been merged to stable/12 yet?" (If I wrote git I'd choose a different format for the message, but consistency is more important than aesthetics here). From owner-freebsd-git@freebsd.org Thu Jun 25 12:56:25 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 2065D35A866 for ; Thu, 25 Jun 2020 12:56:25 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t0Q01nBZz43Wk; Thu, 25 Jun 2020 12:56:23 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qk1-x730.google.com with SMTP id r22so5092642qke.13; Thu, 25 Jun 2020 05:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=J/OZLoIrA6Pu/7FOjAPKexjXI6Oc8d9WIdL6Vwq9q+0=; b=OnCsWU6120VTAAK4CA7AOypQjwCYQ/jEU6HSmCtYEo86fTya+oCwadXFUoE3K7hOng hYBfp8tPArL4auNgWrqafj9355FOM/bVZxUgZ3SiunMJL/+9SzHatq+VV5pdiKQGeRtT b5Iwl4ILX6yVOzcBGjXhfTowqDy88ZptDJVTm/t4cVfRINhJxOtAJJ20gOStDklYZOk+ xmLlXeyFiNbP4f43le8yxW5ADjswHSVh+oRQYBxmpnITBUuf9Nf7Wr+g0oBQipYseDrt DajTPhCQP1/c7Z1CyHUK5LfqKXRpGvNdiHrx+Y9oFjVpibUGsSxUp/rwIK6nCj5RTSkE fszw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=J/OZLoIrA6Pu/7FOjAPKexjXI6Oc8d9WIdL6Vwq9q+0=; b=Cu5ZvhqmlFywLkag82hIMuFeO0kaNa+KIxvRpZeSdrjD5Ax/fGjpSSf0gAKmgqfTi+ nFXKwrpI2PZEvopd7nQnl3JBQbOXajSdt1V1y467+GP951YAZeRTotRbxBO5YemC9GdT sITn61AszBv5ICVac3mPxdq6+nQkYCPFD/GXVQsRXnKORXd8yhNEClW2BkNHZaA/o+rf 1W2hAd3qUqWeU6hRkjxAVRUVEvyOPao7BB6smlDIaU1czr0hFYFWny7UlwxDIIbGiobN Ny9GAXQlSHlu8movO0tcGkKOS3ydb9LFEEq1Pp4ma7yuX8avMmJ1EHOaKH08rK5Lq4AF p8cA== X-Gm-Message-State: AOAM532hqeVQchCVtGyQpjAEIR2iYPZmev3/mpCh56mSDfFnmZRpzi/p aluhbh26+4Qp3fnirRetc/3YJQJw X-Google-Smtp-Source: ABdhPJxzgsJkVggwzZbL4KSmx9118K6v8X4iz4OyVTTsAwLIBQ4mLk4jTTfF+S1QTnrBALLlglD9Lw== X-Received: by 2002:a37:a89:: with SMTP id 131mr29313154qkk.92.1593089782811; Thu, 25 Jun 2020 05:56:22 -0700 (PDT) Received: from mbp.home ([2804:f1c:7300:de00:6d80:2c73:9cf2:2d0d]) by smtp.gmail.com with ESMTPSA id d79sm5865753qkb.101.2020.06.25.05.56.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Jun 2020 05:56:22 -0700 (PDT) Sender: Renato Botelho Subject: Re: svn primer translation to git To: Ed Maste , freebsd-git@freebsd.org References: From: Renato Botelho Organization: FreeBSD Message-ID: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> Date: Thu, 25 Jun 2020 09:56:19 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49t0Q01nBZz43Wk X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=OnCsWU61; dmarc=none; spf=pass (mx1.freebsd.org: domain of gargabsd@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) smtp.mailfrom=gargabsd@gmail.com X-Spamd-Result: default: False [-2.84 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.004]; MID_RHS_MATCH_FROM(0.00)[]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.98)[-0.979]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::730:from]; NEURAL_HAM_SHORT(-0.66)[-0.658]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com] 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 12:56:25 -0000 On 24/06/20 13:34, Ed Maste wrote: > We currently have a FreeBSD Subversion primer in the committer's guide: > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view > > I'm particularly interested in feedback on how much git background / > theory of operation we want to include here (vs referring to external > documentation). Thank you for writing this document! 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. -- Renato Botelho From owner-freebsd-git@freebsd.org Thu Jun 25 13:06:05 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 AE1EC35A8F1 for ; Thu, 25 Jun 2020 13:06:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t0d92mtvz43h1; Thu, 25 Jun 2020 13:06:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f179.google.com with SMTP id b13so5205231ilq.11; Thu, 25 Jun 2020 06:06:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/qHM6tZFvj6UxjC2Eb8ZBkMJL6wv/NONAlKXOjQ9qzQ=; b=OWiwB7JF+JzGr7neB0m88FZpY0lsIrORg8HQONjUk4WWszBfkXatd7X/8kuBnRhmVd FZmItwn+MnJBIpmAZLaRCgbMzeL+U/ijpBSNLIgcG5We6G5bmtfACyme6u+G/jH3SpBN JRH6NjL6BKJJIuRqWokuD+2XCxjbeYvpW5l1ai96fT97WCVUGeoVwh+V9/stw26rZeJt M5t/eXlKs3UYHP69kdNbaHFWpkFrmcQClk0UNxCVMt98RwOBsrdziPpbOUnDIJfxHvJz 8ZVtEdQDvTBuBVqSpaV1cVitxjMvwGbqC5FWW+wq9CgmCyXV7M9x/TdsmmRVuZFy3YOq 68OQ== X-Gm-Message-State: AOAM530+IY3SUUC7k1He3LoOPcatFHiFmeIUtjrxYXbmnDwFwJR2U/jG uVGFQOt15Jphg+kPxHQMVpNP5HnanhS/w+xbLjwRcQ== X-Google-Smtp-Source: ABdhPJwt/aV+iO3Skq1ay/gx3M4onHodE7/l3gxu3DWPRTazb5KhsRPUYNVIkt/yf+PnTPf+1bgQgS0vnOHdE7yp4kQ= X-Received: by 2002:a92:5e07:: with SMTP id s7mr22611633ilb.182.1593090363559; Thu, 25 Jun 2020 06:06:03 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> In-Reply-To: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> From: Ed Maste Date: Thu, 25 Jun 2020 09:05:51 -0400 Message-ID: Subject: Re: svn primer translation to git To: Renato Botelho Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t0d92mtvz43h1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] 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:06:05 -0000 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. From owner-freebsd-git@freebsd.org Thu Jun 25 13:26:14 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 6699435B08B for ; Thu, 25 Jun 2020 13:26:14 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49t14P5vd7z44q0; Thu, 25 Jun 2020 13:26:13 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 05PDQ6fW034595 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 25 Jun 2020 16:26:09 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 05PDQ6fW034595 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 05PDQ6bH034594; Thu, 25 Jun 2020 16:26:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 25 Jun 2020 16:26:06 +0300 From: Konstantin Belousov To: Ed Maste Cc: Renato Botelho , freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200625132606.GB32126@kib.kiev.ua> References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49t14P5vd7z44q0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] 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:26:14 -0000 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 ? From owner-freebsd-git@freebsd.org Thu Jun 25 13:42:31 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 186B635B49A for ; Thu, 25 Jun 2020 13:42:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t1RB3KsCz45Vr; Thu, 25 Jun 2020 13:42:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f179.google.com with SMTP id c75so5335013ila.8; Thu, 25 Jun 2020 06:42:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wpeQsD0l4UR9yrihvc8rW+b+Xl1ik5/TRxgutWi1nTs=; b=rsL7mZsftagl+6pC/4ISRKrRN/t/EDsgynajQ/2lH+vwOu/o9uayuLukL3FNXsAoHs mL2DQ3vOLyFirR+X8i2+PM9YTuI5K1HXd4ipwWi9/oagq2p+Y6fdDeBZ81X0hZEORmLC +BLq1RlaoJ5tHtyl2kPm/5EwfMJbklnZ8W+YBlyFq1ouIj+jVQ0XFZUjtVPSUn7qBjsK CtmsKNcUnFZ5KDHLbGxCAOJ0PjMSAWy7sgh7OKiXSysv8U6CtO2K3qBQjg4UcJzPgLwW 05O9po/H/c53vp0NAI9M7vIcrwMHmvos2WPVpPuJVPOSsZisXvZlnP2JKbfTVSHFDiP2 qdYw== X-Gm-Message-State: AOAM531xfq4+U9kf/8PM9wmBJdydmF6GEFzmgDA5Cmxpasl2Fo8RNsN7 RgiPcefsWOtBrsQt2KRMSlnCY3aSmBfX84P7X4rreQ== X-Google-Smtp-Source: ABdhPJwgnoJd23ocQ0mNJFwKIATwhzU+xri/IYPPO6XkchedIvtvWOQUCI/SOskevLFGnr4iOyETE6mz6kYVl2zyf6E= X-Received: by 2002:a05:6e02:e43:: with SMTP id l3mr509867ilk.11.1593092548985; Thu, 25 Jun 2020 06:42:28 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <20200625132606.GB32126@kib.kiev.ua> In-Reply-To: <20200625132606.GB32126@kib.kiev.ua> From: Ed Maste Date: Thu, 25 Jun 2020 09:42:16 -0400 Message-ID: Subject: Re: svn primer translation to git To: Konstantin Belousov Cc: Renato Botelho , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t1RB3KsCz45Vr X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.99 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.66)[-0.659]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-0.83)[-0.833]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.50)[-0.503]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.179:from]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.179:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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:42:31 -0000 On Thu, 25 Jun 2020 at 09:26, Konstantin Belousov wrote: > > 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 ? I think the hooks are not yet set up on the prototype repository, but that will be indeed one of the pre-commit hooks we need. From owner-freebsd-git@freebsd.org Thu Jun 25 13:48:41 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 0746835B4AB for ; Thu, 25 Jun 2020 13:48:41 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 49t1ZJ6Qhvz45nx; Thu, 25 Jun 2020 13:48:40 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id D27392BCAF; Thu, 25 Jun 2020 13:48:40 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: by mail-yb1-f181.google.com with SMTP id t9so2770310ybk.9; Thu, 25 Jun 2020 06:48:40 -0700 (PDT) X-Gm-Message-State: AOAM532kQ3LSifJPie9yklpn0sLKc2Z6hzo+IC+zyRzYinqT3Q01z3dC wjG3V/oCJzODEXU2/MvyKfEMe1V6fx2Rp4siBSA= X-Google-Smtp-Source: ABdhPJxxb1WLYSVeVm9xK7CcPl5vM6qV5AFrIxXLFu9LnRkOscxcqc5ulXmkIRKu1KqPyQ1IR0fEG1qRI529733hWf8= X-Received: by 2002:a25:e8b:: with SMTP id 133mr51915057ybo.13.1593092920307; Thu, 25 Jun 2020 06:48:40 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> In-Reply-To: From: Mitchell Horne Date: Thu, 25 Jun 2020 10:48:29 -0300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn primer translation to git To: Ed Maste Cc: Renato Botelho , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" 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:48:41 -0000 On Thu, Jun 25, 2020 at 10:06 AM 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. We should advise users to set pull.rebase in their configuration, either globally in ~/.gitconfig or on the repository-level in .git/config. It seems that newer versions of git will print a warning if neither pull.ff or pull.rebase is set. It's unfortunate that we can't include config files as part of the repository, so this will always need to be done manually. > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" 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-- From owner-freebsd-git@freebsd.org Thu Jun 25 15:58:38 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 5AA2035E7B1 for ; Thu, 25 Jun 2020 15:58:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t4SF3kbHz4Fqv for ; Thu, 25 Jun 2020 15:58:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2e.google.com with SMTP id cv17so2989435qvb.13 for ; Thu, 25 Jun 2020 08:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ENHHWFu10HypY9+EQlwfk80n+y7k21g/vLi5Ik0YFoA=; b=iZTIgvjW2OKjZnUJBgGUnF10CiSO0pIaZzYuHEcWszw/Zm07c+idT2BlywoQgZREhS CYBoto8r/euHNlY6RisDKhUS1Lug7CO1KIklFYEIg4S5tnLE5qWAu4IZiXCMFEaa63UR usQxfcQb4rDKdQmlmG2BS2wwFNEiEJQcqRynsiLDJA9oaapV6f+1SqNGrb6hby+5llj/ PtqdpyRHzp/wJc6bzEWLxuKzdXwfGs4G4zoEKLRS/vbQjEqcRoFsMJnSBYMPIHX6CnNh L4xJFFeLtDh2qnJfNjdazyNMwBAodklAFZNlHsvLb+cOTkqV1eK7CvFIuS6Dk66jIQzP Y4xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ENHHWFu10HypY9+EQlwfk80n+y7k21g/vLi5Ik0YFoA=; b=GtgkSGkl/zQSnQkUrcVLbFS09GAIC0/fzY+Pg/uH3FUun0tgx1jNfST2P4wDC8at5i mJrqpWrtKcY8LrCmTX/KolpfWcvp/WK7aINrD8JJEUPmUGIUOY81iPPLzS1tac6UlDP2 BgcZ8BYAsgwgETc7chEnNR1DHNTCq+EEvCF3wg0PjgYnC1+aLp9hDdPJVQoUEF2pn6YU N7rfzw1CL3mrQJKeedvJNZ5mXirl9HDtWYO7weky/2+9sxK600kyjdlw7GvD7cRkyi7E gc+0PTr23+9VIN9fOpPAQNKPXVNcDBaQ85baApBZQilk4hJ1gX/+wsvbJErYXNIMtq66 cRKg== X-Gm-Message-State: AOAM530qK+DmJ5tQEZ5oevyUNf3caweWh+VMbbbt9GlzEdn9IzHS5u5f D5iPcZkh2VQiRhRKUuGma1m698Ho3U8DVS8wrPAFiA== X-Google-Smtp-Source: ABdhPJy3qw307fI4FQwdqNpntMwTlgXWoQcwPOhzAnQrsAPbtGM4Xp4umt7/RjLakm527XGPkfY5PQn4DI9IytMcKm0= X-Received: by 2002:a05:6214:7a5:: with SMTP id v5mr25349988qvz.22.1593100716124; Thu, 25 Jun 2020 08:58:36 -0700 (PDT) MIME-Version: 1.0 References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Thu, 25 Jun 2020 09:58:25 -0600 Message-ID: Subject: Re: svn primer translation to git To: Ed Maste Cc: Kristof Provost , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49t4SF3kbHz4Fqv X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=iZTIgvjW; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2e) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.03 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.84)[-0.841]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.94)[-0.940]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.25)[-0.254]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2e:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 15:58:38 -0000 On Thu, Jun 25, 2020 at 6:55 AM Ed Maste wrote: > On Thu, 25 Jun 2020 at 03:09, Kristof Provost wrote: > > > > The original commit already followed the =E2=80=98headline summary, exp= anded > body=E2=80=99 rule. This MFC would also work (often there=E2=80=99s no bl= ank line between > the =E2=80=98MFC=E2=80=99 and the next line), but I do wonder if MFC r362= 183: netmap: > vtnet: fix races in vtnet_netmap_reg() wouldn=E2=80=99t be better. > > I agree we need to choose and document an approach. > > There are examples of your proposed style already. I would suggest we > go one step further though; the source revision is really metadata, > and ought to be tracked by the tools in an automated or semi-automated > way. The git equivalent for MFCs is `git cherry-pick`, and it has a -x > flag to append the original commit hash. > > Let's say I wanted to MFC r362543 (91285bbdc146 in the current GitHub > mirror): > > ``` > commit 91285bbdc146fee00b83b8605e11aec19ed18b2a > Author: emaste > Date: Tue Jun 23 15:36:05 2020 +0000 > > ldconfig: remove i386 aout invocation > > aout support in ldconfig hasn't been required since FreeBSD 2.x. > > Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 > ldconfig to generate aout ldconfig hints. > > Reviewed by: dim, kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D24883 > > Notes: > svn path=3D/head/; revision=3D362543 > ``` > > To MFC this to a stable/12 worktree I could use > ``` > % git cherry-pick -x 91285bbdc146 > ``` > > When I go to commit the default commit message is: > ``` > ldconfig: remove i386 aout invocation > > aout support in ldconfig hasn't been required since FreeBSD 2.x. > > Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 > ldconfig to generate aout ldconfig hints. > > Reviewed by: dim, kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D24883 > > (cherry picked from commit 91285bbdc146fee00b83b8605e11aec19ed18b2a) > > # Conflicts: > # libexec/rc/rc.d/ldconfig > ``` > > I think this is fine, and consistency will facilitate tooling for > automating to answer questions like "what commits of mine have not > been merged to stable/12 yet?" (If I wrote git I'd choose a different > format for the message, but consistency is more important than > aesthetics here). > At work we have and slightly enforce something more like the following: ... (same as Ed's stuff) Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 Cherry Pick: 91285bbdc146fee00b83b8605e11aec19ed18b2a which would follow our style better, though would require a git tool tweak. This way our commit hooks could enforce it, allowing some flagging of direct commits Direct Commit: yes. or Cherry Pick: n/a Though I don't like the words 'cherry pick' it's the current terminology, isn't git specific and matches the git tooling. Warner From owner-freebsd-git@freebsd.org Thu Jun 25 16:55:54 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 65C0A35F76C for ; Thu, 25 Jun 2020 16:55:54 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49t5kK3KvJz4KWL; Thu, 25 Jun 2020 16:55:53 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 382FA3C0199; Thu, 25 Jun 2020 16:55:47 +0000 (UTC) Date: Thu, 25 Jun 2020 16:55:47 +0000 From: Brooks Davis To: Ed Maste Cc: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200625165547.GA75705@spindle.one-eyed-alien.net> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bp/iNruPH9dso1Pn" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 49t5kK3KvJz4KWL X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-1.69 / 15.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.54)[-0.536]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.02)[0.020]; NEURAL_HAM_SHORT(-0.27)[-0.271]; RCPT_COUNT_TWO(0.00)[2]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] 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 16:55:54 -0000 --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jun 24, 2020 at 12:34:33PM -0400, Ed Maste wrote: > We currently have a FreeBSD Subversion primer in the committer's guide: > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/sub= version-primer.html >=20 > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view >=20 > I'm particularly interested in feedback on how much git background / > theory of operation we want to include here (vs referring to external > documentation). One result of this being a translation of the SVN guide is that it's not IMO GIT-centric enough. It suggests a number of things that are in fact excellent foot cannons (git commit -a being the most egregious). I'd like our document to recommend practices that make it relatively easy to double and triple check commits. E.g. for direct commit I generally follow a process of staging with `git add -p` + `git add` for new files followed by `git status` and/or `git diff --staged`, and then `git commit`. Obviously people will have varying workflows, but for people with little git experience, let's try to prime them with good ones (unlike the quickstart tutorials that do things like `git commit -a -m "foo"`). -- Brooks --bp/iNruPH9dso1Pn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJe9NcNAAoJEKzQXbSebgfA4lgH/j2F2oKcbHVrhwbQKuqeDIM3 d9eVlbJVi1v2ZPnMO3+Wss8T2VUEDpODhL4st4FA7DHTzOS0bYg8b6u5Mw6npQg3 8DzmNUdSCCE5Ye2S+91qG/+arFa4gPrNs5EHAMvKHre6LsGqwP7/Za0w96VPArya 9aJPkW8xHn7Yo6snJw9PbaytHhY4AN5vHCuhAPAZOuW48z5rK7jQSQ+pZaLdSSZT vUkgUaSaKyVq+WSSeVkxyMuog+lXcUx75N88rNU8Can+pvDhrDJT4TKl4695VAEj W8R4eENxkmHxZwGcZfaIBSVZ4zr3fPJqE1vuHGNJKBjd/xanmcTH/c3vrWGvI3A= =zliX -----END PGP SIGNATURE----- --bp/iNruPH9dso1Pn-- From owner-freebsd-git@freebsd.org Thu Jun 25 17:08:47 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 A151B35FA28 for ; Thu, 25 Jun 2020 17:08:47 +0000 (UTC) (envelope-from sean@chittenden.org) Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t61B55dvz4LKt for ; Thu, 25 Jun 2020 17:08:46 +0000 (UTC) (envelope-from sean@chittenden.org) Received: by mail-lf1-x12e.google.com with SMTP id k15so3628214lfc.4 for ; Thu, 25 Jun 2020 10:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chittenden.org; s=8eb15515; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+v6zqJOiA+FpfR2mYnQoH7Et6N0xcAuxb+eVikBFFsU=; b=QgjtuBdnCHYX2tD4sDYe5wai2ycZ1oCC8++YFvqDLwKmV4U+sWsaoGT64OQ8jNonPk H0YrU/LjOKqezTgzF+9E7n6ASGQKVdl9a2vPXe4eZxOwCfYO7cjnjMYkzuyf9KhTq6to gjmEuXu4PUsSAyHy2sqjklIn46ZfDKmjVGlO44xTV4grC7qgifBUE8wcpzzuYT2Antxk deEujZ1+/i2nopiN4V+onIXRm6pOgK3hp89UlxK9AOirF3WdwdQ332WaVchF9ZB3sZna WWwmElWAYU1xwdv6yw3oNG0xYLwU7v4C9G7FNHw8ft/opYZEWPEpjDUfkk8BngjWklh0 CsuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+v6zqJOiA+FpfR2mYnQoH7Et6N0xcAuxb+eVikBFFsU=; b=LLdAG3pVQLvsSX1lsD04EnCW1lVFt2cyDRVmsRFaIAkCP2JigjdSZ4CJ6H3ZmraAeF P23F5g3wsL+DfOCDt9+YbLRj6Sib1d8FUOaOyhwi1cksO+nk36JC8wJQpcZZp2ByulgQ 27OsgK2ApiylADFFemFL0nfDNLqFEu8C+EuE6gV/dGHpktXphvoxhMLubbZFawUgwkTe WFwhmx2O2ndIpEej5LlHeRdKfwWNTk295H2YQeAqk5481arhBeVU5etAEc4TdMwSo+nE 6CW4GKhIbQG/P/1tbJk9TQBLqtbLfZ60N+ao7ktZWMnpXwNZjge++qdi+a9NvYwgSTAr H2Yg== X-Gm-Message-State: AOAM531kCLEYv8Bwoi3AqUx68sFN1VB6q5NGNzwWAeNcyDJFaOrN/Sw7 ylDect8tR5VfgKLkNZoxiW6NiZUhJhPdVTtZM9fbiA== X-Google-Smtp-Source: ABdhPJxItrgn9YVVgXmHo/EnV6GerfcbBfSOGiAowaV8ybzMaEfyPFAh/p7pcdqKKfKHxbBfZMudb0aBWds3oW0X3+8= X-Received: by 2002:a05:6512:1103:: with SMTP id l3mr18919816lfg.108.1593104924481; Thu, 25 Jun 2020 10:08:44 -0700 (PDT) MIME-Version: 1.0 References: <20200625165547.GA75705@spindle.one-eyed-alien.net> In-Reply-To: <20200625165547.GA75705@spindle.one-eyed-alien.net> From: Sean Chittenden Date: Thu, 25 Jun 2020 10:08:28 -0700 Message-ID: Subject: Re: svn primer translation to git To: Brooks Davis Cc: Ed Maste , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49t61B55dvz4LKt X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chittenden.org header.s=8eb15515 header.b=QgjtuBdn; dmarc=pass (policy=none) header.from=chittenden.org; spf=pass (mx1.freebsd.org: domain of sean@chittenden.org designates 2a00:1450:4864:20::12e as permitted sender) smtp.mailfrom=sean@chittenden.org X-Spamd-Result: default: False [-3.11 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; R_DKIM_ALLOW(-0.20)[chittenden.org:s=8eb15515]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_HAM_LONG(-0.99)[-0.987]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[chittenden.org:+]; DMARC_POLICY_ALLOW(-0.50)[chittenden.org,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::12e:from]; NEURAL_HAM_SHORT(-0.14)[-0.140]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 17:08:47 -0000 > > generally follow a process of staging with `git add -p` + `git add` for > new files followed by `git status` and/or `git diff --staged`, and then > `git commit`. > This is a good callout, Brooks. I'm routinely shocked by the number of people who don't know about or use `git add -p` as their muscle-memory way to add something to a commit. We definitely should go out of our way to document best practices. For instance, this has been the workflow that I've worked in or pushed teams to for the last 6yrs and have had decent success: 1. Create Github issue 2. git checkout -b gh-${issue_number} 3. git add -p 4. git status 5. git diff --staged 6. git commit 7. git push -u origin gh-${issue_number} Where `gh-` would be whatever bug-tracking system of choice that you fancy, but it keeps branch naming concise and gives the future reader a hint as to where to look for discussion. While there may be variants of this, we should begin to prescribe a consistent workflow that does not encourage `git commit -a -m "fixedit"` or committing directly to main (svn's fka trunk branch). -sc From owner-freebsd-git@freebsd.org Thu Jun 25 17:13:15 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 B49E535FD4C for ; Thu, 25 Jun 2020 17:13:15 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49t66M0TY5z4LdM; Thu, 25 Jun 2020 17:13:14 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 4E99B3C0199; Thu, 25 Jun 2020 17:13:14 +0000 (UTC) Date: Thu, 25 Jun 2020 17:13:14 +0000 From: Brooks Davis To: Sean Chittenden Cc: Ed Maste , freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200625171314.GB75705@spindle.one-eyed-alien.net> References: <20200625165547.GA75705@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wq9mPyueHGvFACwf" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 49t66M0TY5z4LdM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-2.74 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.30)[-0.303]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.82)[-0.817]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.72)[-0.723]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] 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 17:13:15 -0000 --wq9mPyueHGvFACwf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 25, 2020 at 10:08:28AM -0700, Sean Chittenden wrote: > > > > generally follow a process of staging with `git add -p` + `git add` for > > new files followed by `git status` and/or `git diff --staged`, and then > > `git commit`. > > >=20 > This is a good callout, Brooks. >=20 > I'm routinely shocked by the number of people who don't know about or use > `git add -p` as their muscle-memory way to add something to a commit. We > definitely should go out of our way to document best practices. For > instance, this has been the workflow that I've worked in or pushed teams = to > for the last 6yrs and have had decent success: >=20 > 1. Create Github issue > 2. git checkout -b gh-${issue_number} > 3. git add -p > 4. git status > 5. git diff --staged > 6. git commit > 7. git push -u origin gh-${issue_number} >=20 > Where `gh-` would be whatever bug-tracking system of choice that you fanc= y, > but it keeps branch naming concise and gives the future reader a hint as = to > where to look for discussion. While there may be variants of this, we > should begin to prescribe a consistent workflow that does not encourage > `git commit -a -m "fixedit"` or committing directly to main (svn's fka > trunk branch). One practice I've not adopted that we may want to recommend (especially if we're going to have pre-commit scripts for people to install) is to make your origin use a read-only url so you have to make an explicit push to (e.g.) a freebsd remote. At least at the beginning when it appears we're going to be allowing direct commit, that's a way to limit foot shooting. -- Brooks --wq9mPyueHGvFACwf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJe9NspAAoJEKzQXbSebgfA+HUH/jE7c4LxyWvaBPj7WjJCLDiZ SeE3DOMQCb9YqHsbeisDfh2Bwg4A5oRE3uAkvcmBMY+zPlkgB6bwvWTw7v9Rc581 0dNR9/jeppSpeX4OR5UGWpNg/BpLLNQBf/629Zl1+lJf+f1PJuIZ1O1vN91CPsKi olWpcNnEO3lIurq0D6Y3vmvypvhFWWhNiUhYpbwTcG5b58yEyROhpvE2Jpvh2UAv 5IYx8ipRcvnIam9ivk8sKtbSpX2wvh6i8ifGA/Sz5/fKkEgmSvAo7NOkmI42bXqL zJvqzhLZs6Q6Ws713G/DLxhYmyhar5BGR6K4STski6uOmyr4+ZIPtUkj8p2X6MY= =+ILz -----END PGP SIGNATURE----- --wq9mPyueHGvFACwf-- From owner-freebsd-git@freebsd.org Thu Jun 25 17:21:47 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 AF3F435FE67 for ; Thu, 25 Jun 2020 17:21:47 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t6JC2p4pz4LrH; Thu, 25 Jun 2020 17:21:47 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ed1-f68.google.com with SMTP id m21so4802247eds.13; Thu, 25 Jun 2020 10:21:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=McczE3CLUBoZcxlcfDbj66RpDWBwSVuQN0NToUengv4=; b=P7k4ygReh8YZnHuqv9w3nec+j4s5SHYJGBIbWdeuLG9bGEQebi1THR0JU7AtO7YaDQ W0VkLgmJaFZEPZu0EphkrUPs6cOo+Me36brs2NIpXl6no7LTgOIqmEr2URJ2g1CHfnu4 FwPyvLEQ3fWtVST/kziov2QDCc+sEsSNdREjplofhHh5bm7oHjaJT/lhjMmqJc0CXgiF E+BvzGQFxMccwCJeBRslQEdqFfM/isf91hmu9ZDg5MP0EckKXGRAYH+UtmKzhmGn3lRZ +3o0ACm02EMBd/6XDe/fxEjytbWz5Aiz50eiGu76t544habgWMohmI3T/Oy8vFwCz29t T0nA== X-Gm-Message-State: AOAM5300eQdwND9iLA082BZoLvJq/lgEO0xQ9mIoxwUkHpKhGecVafbB 8vwMVk+/de56UuGrY6Y4Iy4KolqAyhQ= X-Google-Smtp-Source: ABdhPJzbuyCiplFiWqqpUKfmeDwAXP6/WYSNf33ZV+4SDbj1x2MuYlXKkAOySKhe7NEyGzn6vjKXTA== X-Received: by 2002:aa7:da89:: with SMTP id q9mr14870959eds.273.1593105705773; Thu, 25 Jun 2020 10:21:45 -0700 (PDT) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com. [209.85.128.45]) by smtp.gmail.com with ESMTPSA id u60sm11115259edc.59.2020.06.25.10.21.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Jun 2020 10:21:45 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id 17so6774233wmo.1; Thu, 25 Jun 2020 10:21:45 -0700 (PDT) X-Received: by 2002:a1c:2044:: with SMTP id g65mr4992687wmg.16.1593105704723; Thu, 25 Jun 2020 10:21:44 -0700 (PDT) MIME-Version: 1.0 References: <20200625165547.GA75705@spindle.one-eyed-alien.net> In-Reply-To: <20200625165547.GA75705@spindle.one-eyed-alien.net> From: Alexander Richardson Date: Thu, 25 Jun 2020 18:21:32 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn primer translation to git To: Brooks Davis Cc: Ed Maste , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t6JC2p4pz4LrH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] 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 17:21:47 -0000 On Thu, 25 Jun 2020 at 17:55, Brooks Davis wrote: > > On Wed, Jun 24, 2020 at 12:34:33PM -0400, Ed Maste wrote: > > We currently have a FreeBSD Subversion primer in the committer's guide: > > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > > > I've started a translation of this into a Git primer, at: > > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view > > > > I'm particularly interested in feedback on how much git background / > > theory of operation we want to include here (vs referring to external > > documentation). > > One result of this being a translation of the SVN guide is that it's not > IMO GIT-centric enough. It suggests a number of things that are in > fact excellent foot cannons (git commit -a being the most egregious). > I'd like our document to recommend practices that make it relatively > easy to double and triple check commits. E.g. for direct commit I > generally follow a process of staging with `git add -p` + `git add` for > new files followed by `git status` and/or `git diff --staged`, and then > `git commit`. > > Obviously people will have varying workflows, but for people with little > git experience, let's try to prime them with good ones (unlike the > quickstart tutorials that do things like `git commit -a -m "foo"`). I know many people don't like using graphical tools for this, and despite it not being a particularly nice UI, I find `git gui` to work very well for checking that I don't accidentally commit something I didn't mean to commit. It also makes adding individual lines a lot easier than git add -p. Recent versions of CLion also have a reasonably nice UI to avoid that problem. Alex From owner-freebsd-git@freebsd.org Thu Jun 25 17:47:37 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 8547B34088D for ; Thu, 25 Jun 2020 17:47:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t6t057NSz4NRb for ; Thu, 25 Jun 2020 17:47:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2f.google.com with SMTP id t7so3205792qvl.8 for ; Thu, 25 Jun 2020 10:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=96+hupQZWeMolrTGU26wP+fIKERdVbFhF6tPlLsFnIY=; b=BCMvYhOFo46ToSDSVBRI7QusigcO3W6UdItIUwc7wCJcCzvFPskqAzdJWe0NvMVIAQ yoMwkNgPZxY4uzGw27VlwadHgMiLkNk1K6DWeHXuFxNYNVgrRvH6w09z9Lx/G5FtGWeQ q9fwdF6m913Np9pmGrcIdze7nP3afaGEu/YjR7za86y7SEG21crt8ta+K8LfXvZ3vKhG cxQydFH5T0vitTTl9qmqgQSL1lAlA1egnGWmlEAs7XnaT3JfA1Ho5ySjVI14fHjIWUj0 RZ34ltkgKtNFzI/QFq1QFrNcZ5TeHfg/pOY/glH2pDXng8+OkvsPNdJVEHn6MtFDksdt NWkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=96+hupQZWeMolrTGU26wP+fIKERdVbFhF6tPlLsFnIY=; b=iJwuuTkjrZFtaNo/G95SS2n4ipuapCD9xIGgr9t85yRLGOkTrtNApSyzhwn8IJBAln YKKdCli5uiyORoq/pJI+jIzfNHhhiKXCnPBrUon5lC7sEQ58kiHVR7Wu1YZKifCj/0K4 3jC0ZENqJ02KDBBSpeWxOvWIaEmeQA5nd8z1LmQlVFLHkD+h/gMJyVBXhjgX9m60yv9H om4pIEahdV667EmMIhAs7xg/XalAUWdW9VBkTEQ4TABn8924REr0uDE5jC+2kMpmsNQQ KhQF5rwlQAUJlf9FUwZOpa0suvOJO29Xuig+dYqZtiyr2GSKLHLYO/+lVb6EOX0wYCfE u7Yg== X-Gm-Message-State: AOAM5302vAPhr+ZzwfJDLuyBhi/DVjrEkQH31L3fD/d09/SQvopwqRAK bc/Z3WErVisZVcy83sVht3UpXqouiMHHghctVyYlMV+P8jU= X-Google-Smtp-Source: ABdhPJypsyPndmYAzSsLk1y/PhAQ+zIK/38GvjfpOvuor/G/w8hHQgizGYSidLDiBrLaTz9urq+VxzsI/jvsBfo6CeQ= X-Received: by 2002:a05:6214:922:: with SMTP id dk2mr37784051qvb.87.1593107255052; Thu, 25 Jun 2020 10:47:35 -0700 (PDT) MIME-Version: 1.0 References: <20200625165547.GA75705@spindle.one-eyed-alien.net> <20200625171314.GB75705@spindle.one-eyed-alien.net> In-Reply-To: <20200625171314.GB75705@spindle.one-eyed-alien.net> From: Warner Losh Date: Thu, 25 Jun 2020 11:47:24 -0600 Message-ID: Subject: Re: svn primer translation to git To: Brooks Davis Cc: Sean Chittenden , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49t6t057NSz4NRb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=BCMvYhOF; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2f) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.53 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.87)[-0.866]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.94)[-0.943]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.72)[-0.723]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2f:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 17:47:37 -0000 On Thu, Jun 25, 2020 at 11:13 AM Brooks Davis wrote: > On Thu, Jun 25, 2020 at 10:08:28AM -0700, Sean Chittenden wrote: > > > > > > generally follow a process of staging with `git add -p` + `git add` for > > > new files followed by `git status` and/or `git diff --staged`, and then > > > `git commit`. > > > > > > > This is a good callout, Brooks. > > > > I'm routinely shocked by the number of people who don't know about or use > > `git add -p` as their muscle-memory way to add something to a commit. We > > definitely should go out of our way to document best practices. For > > instance, this has been the workflow that I've worked in or pushed teams > to > > for the last 6yrs and have had decent success: > > > > 1. Create Github issue > > 2. git checkout -b gh-${issue_number} > > 3. git add -p > > 4. git status > > 5. git diff --staged > > 6. git commit > > 7. git push -u origin gh-${issue_number} > > > > Where `gh-` would be whatever bug-tracking system of choice that you > fancy, > > but it keeps branch naming concise and gives the future reader a hint as > to > > where to look for discussion. While there may be variants of this, we > > should begin to prescribe a consistent workflow that does not encourage > > `git commit -a -m "fixedit"` or committing directly to main (svn's fka > > trunk branch). > > One practice I've not adopted that we may want to recommend (especially > if we're going to have pre-commit scripts for people to install) is to > make your origin use a read-only url so you have to make an explicit > push to (e.g.) a freebsd remote. At least at the beginning when it > appears we're going to be allowing direct commit, that's a way to > limit foot shooting. > I almost always do a git show for each and every commit I push. The few times I've tried to short cut this, I've wound up in trouble. I also am a big believer in git rebase -i and git commit --amend to curate the commits I'm going to push in. The more you can show people how to double check the commit, fix what's broken, etc, the better off we'll be. And the better off people will be since they will have more tools to un-screwup something they did by mistake. Unlike svn, rewriting history (especially local history) is a big feature. I use git commit -a all the time, though, since I hate git add. But only when I'm sure that's the right thing and I have enough checks and balances in place with the curation process I can do that). I agree, we should recommend against it. Since I also know how to un-footshoot w/o it being a traumatic web search and anxiety ridden typing of git commands blind, hoping for the best.... Warner From owner-freebsd-git@freebsd.org Thu Jun 25 18:06:23 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 39622340D91 for ; Thu, 25 Jun 2020 18:06:23 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49t7Hf3Gp4z4PKZ for ; Thu, 25 Jun 2020 18:06:22 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 66CC13C0199; Thu, 25 Jun 2020 18:06:21 +0000 (UTC) Date: Thu, 25 Jun 2020 18:06:21 +0000 From: Brooks Davis To: Warner Losh Cc: Sean Chittenden , freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200625180621.GC75705@spindle.one-eyed-alien.net> References: <20200625165547.GA75705@spindle.one-eyed-alien.net> <20200625171314.GB75705@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oJ71EGRlYNjSvfq7" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 49t7Hf3Gp4z4PKZ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-2.41 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.36)[-0.363]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.80)[-0.797]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.35)[-0.354]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] 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 18:06:23 -0000 --oJ71EGRlYNjSvfq7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 25, 2020 at 11:47:24AM -0600, Warner Losh wrote: > On Thu, Jun 25, 2020 at 11:13 AM Brooks Davis wrote: >=20 > > On Thu, Jun 25, 2020 at 10:08:28AM -0700, Sean Chittenden wrote: > > > > > > > > generally follow a process of staging with `git add -p` + `git add`= for > > > > new files followed by `git status` and/or `git diff --staged`, and = then > > > > `git commit`. > > > > > > > > > > This is a good callout, Brooks. > > > > > > I'm routinely shocked by the number of people who don't know about or= use > > > `git add -p` as their muscle-memory way to add something to a commit.= We > > > definitely should go out of our way to document best practices. For > > > instance, this has been the workflow that I've worked in or pushed te= ams > > to > > > for the last 6yrs and have had decent success: > > > > > > 1. Create Github issue > > > 2. git checkout -b gh-${issue_number} > > > 3. git add -p > > > 4. git status > > > 5. git diff --staged > > > 6. git commit > > > 7. git push -u origin gh-${issue_number} > > > > > > Where `gh-` would be whatever bug-tracking system of choice that you > > fancy, > > > but it keeps branch naming concise and gives the future reader a hint= as > > to > > > where to look for discussion. While there may be variants of this, we > > > should begin to prescribe a consistent workflow that does not encoura= ge > > > `git commit -a -m "fixedit"` or committing directly to main (svn's fka > > > trunk branch). > > > > One practice I've not adopted that we may want to recommend (especially > > if we're going to have pre-commit scripts for people to install) is to > > make your origin use a read-only url so you have to make an explicit > > push to (e.g.) a freebsd remote. At least at the beginning when it > > appears we're going to be allowing direct commit, that's a way to > > limit foot shooting. > > >=20 > I almost always do a git show for each and every commit I push. The few > times I've tried to short cut this, I've wound up in trouble. >=20 > I also am a big believer in git rebase -i and git commit --amend to curate > the commits I'm going to push in. The more you can show people how to > double check the commit, fix what's broken, etc, the better off we'll be. > And the better off people will be since they will have more tools to > un-screwup something they did by mistake. Unlike svn, rewriting history > (especially local history) is a big feature. >=20 > I use git commit -a all the time, though, since I hate git add. But only > when I'm sure that's the right thing and I have enough checks and balances > in place with the curation process I can do that). I agree, we should > recommend against it. Since I also know how to un-footshoot w/o it being a > traumatic web search and anxiety ridden typing of git commands blind, > hoping for the best.... There's a time and place for many foot cannons, but there's no need to even mention them in our documentation unless it's completely essential. People can explore the infinite vastness of git options on their own. -- Brooks --oJ71EGRlYNjSvfq7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJe9OecAAoJEKzQXbSebgfAJcgIAKHlTycVagqTuIZqxM4BRDJ4 P/dxolyHCcCN1G6Ekx8OqsrZ0/3E8yghI4qcPQ/2fPVnbYto0vnqDzyfGAkdPBLl nw3Wqn2dnRnApox2c/wY+0oDs9ncLy5dVjrWiq+3avHp31mZPpBCFiaQ8oLIBe+s vODo2YJ48olc0GlTYYgQuWXblnri+IPnNoFDb32gOnn0X3aqIKVX80BfeM1VKZ+t SemqMaNHYYaoxx8nix9c/+g7Oj/mG/12mFpOR/RC1Pu2W0iTWpzGyMZuwB50S3Oj 9X8ELC1xKhFJxCWe8S3vaBObqSsBOwIxGVssV7s8Uba6MVQzHlMrYoFy4QDklQA= =8ngy -----END PGP SIGNATURE----- --oJ71EGRlYNjSvfq7-- From owner-freebsd-git@freebsd.org Thu Jun 25 18:11:03 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 DB23A340EB4 for ; Thu, 25 Jun 2020 18:11:03 +0000 (UTC) (envelope-from dan@langille.org) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49t7P20pCqz4PJ2 for ; Thu, 25 Jun 2020 18:11:01 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 148A25C00A9 for ; Thu, 25 Jun 2020 14:11:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 25 Jun 2020 14:11:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= from:content-type:mime-version:subject:date:references:to :in-reply-to:message-id; s=fm1; bh=uFLMOTcOgs7t7uMeneVFCRq6g/SkP L0zmg8mWi+/yVo=; b=ZnOHgdyFmBsUidp2x49XpOCjfKbllYQL7YfRJmUUT/hi1 91IGy5I+FoDR9Hhv8PcApRSgxH8qZlulMdn0A3V+hrdTsvPhpF1qNvitT4o+K6Mw Iu+FsOtKJSpUMN5LxXfQ17L6yg4aTSH09gogs0nqDqUbxotfy3M1J/eqgMTrLehY 0ukui3aqdcuf0N0MvyMKMiZ7qIIDmb7pJBNnGff3TKBaU8YjY2xeGNUU/8UTLPyz H7jsLBgwtISqlHbk3iNUoHk4bYKV3sWyNLIpSSn7/OeQIH5SFVj37PXStEDyRFA0 MA3LEiGgPtIWWPgsD8qcPMIe2cSimqx+reqED10+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=uFLMOT cOgs7t7uMeneVFCRq6g/SkPL0zmg8mWi+/yVo=; b=d5cWQX5IwI3eyOqWsuqO4w EWMWmzE3BUcxUR6dvFNhWMtUc2HZjo01/oI/Al6a36IL3LBgl8Mqbf65vLIGYSHH Gd8kC9LehzqbY/L4RnyFsgaY/eqJ43SCt7K45BfKJqaPwnEQ1h4gVPUz8vt3Qd7f 1v4G79GrN24dyaU8uuYRAuqvIw8ioalK4n6aH6TGi1JSAz34xdlVYVrCSn23VZGk 8qHiqIDXhmuflGjhR9gm5c/dk6CE1jODg9p+b/ycNUBxg0tplR4bcaaLuokvwJrU W0TeI+UhhKnr0r2quWfNxBSwj60KsRmaQfXmBL4CH4diEwEaXV1N80YrUBKE9xEA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudekledguddvfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephfgtggfuffhfvfgjkffosegrtd hmrehhtdejnecuhfhrohhmpeffrghnucfnrghnghhilhhlvgcuoegurghnsehlrghnghhi lhhlvgdrohhrgheqnecuggftrfgrthhtvghrnheptdduheekleekhfeiueduveefteelhe euieevffegffeukefgudejvddvfeeiuddvnecuffhomhgrihhnpehlrghnghhilhhlvgdr ohhrghenucfkphepuddtkedrfeeirdelhedruddtnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: from pro02.wifi.int.unixathome.org (pool-108-36-95-10.phlapa.fios.verizon.net [108.36.95.10]) by mail.messagingengine.com (Postfix) with ESMTPA id C27F3306781C for ; Thu, 25 Jun 2020 14:10:59 -0400 (EDT) From: Dan Langille Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn primer translation to git Date: Thu, 25 Jun 2020 14:10:59 -0400 References: <20200625165547.GA75705@spindle.one-eyed-alien.net> <20200625171314.GB75705@spindle.one-eyed-alien.net> <20200625180621.GC75705@spindle.one-eyed-alien.net> To: freebsd-git@freebsd.org In-Reply-To: <20200625180621.GC75705@spindle.one-eyed-alien.net> Message-Id: <78984441-460D-477F-939A-9F7237DAD757@langille.org> X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Rspamd-Queue-Id: 49t7P20pCqz4PJ2 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm1 header.b=ZnOHgdyF; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=d5cWQX5I; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.26 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm1,messagingengine.com:s=fm3]; RECEIVED_SPAMHAUS_PBL(0.00)[108.36.95.10:received]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.26:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.99)[-0.989]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.01)[-1.006]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.26]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-0.50)[-0.502]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.26:from] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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 18:11:03 -0000 > On Jun 25, 2020, at 2:06 PM, Brooks Davis wrote: >=20 > There's a time and place for many foot cannons, but there's no need to > even mention them in our documentation unless it's completely = essential. > People can explore the infinite vastness of git options on their own. There ^ Limit the primer to the usual work flow that committer should follow. Put unusual workflows to other documentation. Show me how to get the ports tree, make a change, check it in. Cover common things we used to do, and how to do them now. For example svn cp, when moving something in the ports tree (say from one category to another). What do we do with git? =E2=80=94=20 Dan Langille http://langille .org/ From owner-freebsd-git@freebsd.org Thu Jun 25 18:33:57 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 6F60C3419E8 for ; Thu, 25 Jun 2020 18:33:57 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from lb3-smtp-cloud8.xs4all.net (lb3-smtp-cloud8.xs4all.net [194.109.24.29]) (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.xs4all.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t7vT0130z4Qxd for ; Thu, 25 Jun 2020 18:33:56 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from cust-d4a83f22 ([IPv6:fc0c:c11d:cecc:f58a:eaa1:c0:9d8f:c143]) by smtp-cloud8.xs4all.net with ESMTPA id oWh7jhPhJ97i5oWh8jXCEE; Thu, 25 Jun 2020 20:33:55 +0200 From: Adriaan de Groot To: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Date: Thu, 25 Jun 2020 20:33:47 +0200 Message-ID: <5295692.8gLySxXtyI@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: References: <20200625171314.GB75705@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4824989.YNO7O01DYZ"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4wfFeUUhScBJ3aumMSchMnr7HBcHx5RLamPA9G7Wpoe0gRDX+3o1N4dYtZX9uyV1sa6dBXFX2wpMyi72Vkbbdufjl1kzfsQWsgfGxClGKEsvVoVZkrVjTw EefG0Nf6N5+QKwQ9UUzPxCmYAAm0w420W7LkkaA2LJtvIZrfj+8utPooFsIYq/R8DFp0me0c4CWaJA== X-Rspamd-Queue-Id: 49t7vT0130z4Qxd X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] 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 18:33:57 -0000 --nextPart4824989.YNO7O01DYZ Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" On Thursday, 25 June 2020 19:47:24 CEST Warner Losh wrote: > > One practice I've not adopted that we may want to recommend (especially > > if we're going to have pre-commit scripts for people to install) is to > > make your origin use a read-only url so you have to make an explicit > > push to (e.g.) a freebsd remote. At least at the beginning when it > > appears we're going to be allowing direct commit, that's a way to > > limit foot shooting. > > I almost always do a git show for each and every commit I push. The few > times I've tried to short cut this, I've wound up in trouble. Something else to explicitly discourage is fast-cycle "git commit -a ; git push" which I've seen some people do in other projects: it mimics the svn approach of "when you commit it goes to the central repo immediately" but misses all the useful bits of a DVCS -- the ones Warner just mentioned, of rewriting local history and making the branch or sequence of commits logical and well-documented in commit messages. This might sound a little Linussy, but maybe we should for a while offer "git intermediates" where act like the Linux staging trees / lieutenants who gate things through to the primary repository. That can help alleviate friction when people start pushing their own stuff. Oh, and I should mention the KDE setup of GitLab, too: - merges in the real repository *socially* require a review and merge by someone else (this can also be done technically, but that's a GitLab enterprise feature) - pushes to normal branches are ok (this is where some MRs come from) but you can't force-push - branches called work/ are .. work branches, and force-pushes are ok there. This approach means that you can coach people on their work branches, before merging them in to the primary branch with whatever strategy you like. It slows down *some* things, just a little bit, (nice when it's a footcannon) and helps people up the git learning curve. [ade] --nextPart4824989.YNO7O01DYZ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEV+FL0c1sGYvBG/GNYafSYnfk0NsFAl707gsACgkQYafSYnfk 0NtzcQwAp6pAJAKCAyHXpHzAgjkgfQBf27SiJIT3ivCV72MfJmhu4LESRdGZmwOf 2kKZ2w2YlP2HfnNF39ar6fA/INUV4K0oP7FlBUvD124oKwuwmpKjzCBcl9gxtKmO JBAMBDipmGe6jwR70kqKl5mYpALsmemvKwG3PmEAAuY0ChCFkrL5eWiS46mXsPy5 n/ldKUFhtFc67s63pRzo84HBvvTxZXx81LZGWhCJCXttxLcI8T8mJiIkIgz9FZw+ 5nJwbXEyCG7D2t/ytDDI1/MGDFx+qqH3UBBkQnhl+yLtGAyOT6N3jXEaEDSoD1De /XzvnnjWeTX972o+JPi8+D+j/1uvJEyWW+6mOC7d64QmPFW+PDJxn29ACE+KwFFp dI1zevIXu2ZvBMtdNePyudN0Ff4oq14GsIe8p3pIAUl793c9BAzgCbmFNKvA0DtK 7gtsQAvlyl7A7FlJd5FdYYxTOzaS0uRO0NhnXXQFYLSzeOdeBuAjeu5K5KNUrPeq BnG/hHk0 =Fo7Q -----END PGP SIGNATURE----- --nextPart4824989.YNO7O01DYZ-- From owner-freebsd-git@freebsd.org Thu Jun 25 20:02:31 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 B1DBE343F50 for ; Thu, 25 Jun 2020 20:02:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t9sg2lp4z4Wng; Thu, 25 Jun 2020 20:02:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f170.google.com with SMTP id k6so6467392ili.6; Thu, 25 Jun 2020 13:02:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yHVxrlSy80uTZP4cNiN97kGKHiO2nKL3Nh6VjDan/08=; b=P6RLUFFcARR/DriffC77YRVPk9EEQnVIzXA0PFe6VoN17bQkPE52sL6bpW0uAsUqq6 3KDSwrL4PARTK+V78VLJ2GbGQW9TmfD4jBCrPHp5rhRpFgFSSCyDxdPjRlZSYVuZEmE1 vjiSE4EhPFWnnPYAz8UG5l+/Om2t16ossz4XW6iZzOFx2WFYykbi1oEC7F3g/R/uoROn mRWKKoB9tEWMCib2UNm4sUuVzdhOxk2XZSrfXSDZss0yqQ67BlxS6QEjmIfE5ib/eWis 8NeIsqR8dxCzD/qIbauy/wbzLv4yuOwYmUhRqu66FkeMI0T3w3zeT61ZnfiniWpaQVLu PRAw== X-Gm-Message-State: AOAM530frN2xY8JR+zfI+dgo6/Iy9qq398rjs69A7ComWiqtcbptTMah 0pKSDnx9T4x0qsQ4lVfjFk6Gl+5VV5ftVkjQxXOo8Q== X-Google-Smtp-Source: ABdhPJx5N7cRxiqayKZntlSD8mQN3o/KeK5L2TN8VNg2kQrKejLTAFZ0odDyvak4V38HJi1TyXzCoLfN2WXBvBS5+BY= X-Received: by 2002:a05:6e02:962:: with SMTP id q2mr26737142ilt.256.1593115349060; Thu, 25 Jun 2020 13:02:29 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Thu, 25 Jun 2020 16:02:17 -0400 Message-ID: Subject: Re: svn primer translation to git To: Mitchell Horne Cc: Renato Botelho , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t9sg2lp4z4Wng X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] 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 20:02:31 -0000 On Thu, 25 Jun 2020 at 09:48, Mitchell Horne wrote: > > We should advise users to set pull.rebase in their configuration, > either globally in ~/.gitconfig or on the repository-level in > .git/config. It seems that newer versions of git will print a warning > if neither pull.ff or pull.rebase is set. It's unfortunate that we > can't include config files as part of the repository, so this will > always need to be done manually. I agree it's unfortunate we can't set repository-level defaults that come along with the initial clone. We could have a script though that users can run to display or adjust the appropriate settings, perhaps. Our standard quickstart instructions could be something like % git clone foo@cgit-beta.freebsd.org/src.git % cd src % sh tools/git-repo-init.sh From owner-freebsd-git@freebsd.org Thu Jun 25 20:05:33 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 1C48B344309 for ; Thu, 25 Jun 2020 20:05:33 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t9x82S8mz4XK9; Thu, 25 Jun 2020 20:05:32 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id c4so7463072iot.4; Thu, 25 Jun 2020 13:05:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=adHEAFDUFWp2nK7QjYPSa4F9XtcwHg5zAGP7b5jlQ9U=; b=KhmJ8W/zWpsli4afaOa4oUK5iIOVY/tn8yNhDMiJijK06mlMRdjwLY2e7R381se9AL VOqQ0g7U1iUaq3KPXjMFNM+NIyqKdU1SiWCiTSGBRKJNG+pZAOprdoepltjl2xM0iq2F 9felvhVVntcwABWEdPO1df5iSNitsLqGcwHc2+bfkWfvF5Vp2IeAFW2Ta7iAgy/tvPka Y2zsar3UAW6MnFOxHyDbWOt/SPHOPOodXCeaIIMLv80jSdMncMv2Z5qfPk2J7RHDai1s +oA33t42DBWZ0cqGiQK1OGKl7H0UqNMi0oY8w1lxHX8wJ+6OvF/ZaMCmilJxXzU25Bwc 9LLg== X-Gm-Message-State: AOAM530jXBWw0lhnJQ3nzzb2oWmRG71XBdZF91JQMFg+YYZ69HCGkUUn CqZeMMJf8whNo8O8tYYoTuU/3tpjRn8GGbSERRE= X-Google-Smtp-Source: ABdhPJyTce6ve9f+vzlLWArn4lgXKh8GKKdq9iJcZv3UNJ95paot4m41AVmfOJFV4rMy6noByyNpCtIn/XH0dPRAKf8= X-Received: by 2002:a05:6602:2583:: with SMTP id p3mr39847085ioo.179.1593115531200; Thu, 25 Jun 2020 13:05:31 -0700 (PDT) MIME-Version: 1.0 References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Thu, 25 Jun 2020 16:05:19 -0400 Message-ID: Subject: Re: svn primer translation to git To: Warner Losh Cc: Kristof Provost , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t9x82S8mz4XK9 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.49 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.86 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.977]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.91)[-0.907]; NEURAL_SPAM_SHORT(0.03)[0.029]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.49:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.49:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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 20:05:33 -0000 On Thu, 25 Jun 2020 at 11:58, Warner Losh wrote: > > At work we have and slightly enforce something more like the following: > ... (same as Ed's stuff) > Reviewed by: dim, kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D24883 > Cherry Pick: 91285bbdc146fee00b83b8605e11aec19ed18b2a I'm a little leery of custom metadata formats, in case we have a mix of people using both unmodified and patched clients. I suppose if we have a commit hook that requires our preferred metadata form it would be workable. From owner-freebsd-git@freebsd.org Thu Jun 25 20:05:49 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 2D729344228 for ; Thu, 25 Jun 2020 20:05:49 +0000 (UTC) (envelope-from r@robakdesign.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t9xQ5YYzz4XKM for ; Thu, 25 Jun 2020 20:05:46 +0000 (UTC) (envelope-from r@robakdesign.com) Received: by mail-wr1-f45.google.com with SMTP id j4so4699726wrp.10 for ; Thu, 25 Jun 2020 13:05:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=36Qx0C2Hi0K+B2/WFdaeJg+5DDV8GnKD+c6zx24QJT4=; b=n+X3qGzGXbyj7AtlItLEdHqdXGGGHbuVObIdpC0UWlCzgZ57UPIsf9sySouTPGKe+q L6uKiHKSbtNljMHDxHLJ33k4yfpsC3FsXvnAfsE31BqkBHRmUD+ScGsLxsINtzguCQt5 VfeZlDM6rFBo+DUKuViDmNvoH+cQsqJ2dfJHTMR35KddSd3UcDDXhDw6lNuXj2l6K0L/ oX8sFJQxx8gXCQlX0qaLYM3j46U0sQ+lfScdPK0y87ad61DRSdvy1lBl0FVoEKqVfG1f 4GRtle29K3TT9c5dHc01LTtS4PX2Wege9GIieQvHLHRJzVsBLbwekyEUmcMdojbNGSIw cY7g== X-Gm-Message-State: AOAM530u4DF58YyMwSpIMLbKf8qFiVl3uKQk5dV9SF6mXEqVmMDb0Sxn mK87lbkILkjRqTgqQeo0D8qHLc7p5vA= X-Google-Smtp-Source: ABdhPJw1FP+sgQrt5Ey434cHf8QqGVeAramKCYFZxsIhJUmPAdBriRzWHXmsUwszO36uejASWXl1Kw== X-Received: by 2002:a5d:6a46:: with SMTP id t6mr11905044wrw.374.1593115544994; Thu, 25 Jun 2020 13:05:44 -0700 (PDT) Received: from [192.168.168.186] (102.235.6.51.dyn.plus.net. [51.6.235.102]) by smtp.gmail.com with ESMTPSA id v5sm13631282wre.87.2020.06.25.13.05.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2020 13:05:44 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: svn primer translation to git From: =?utf-8?Q?Bart=C5=82omiej_Rutkowski?= In-Reply-To: Date: Thu, 25 Jun 2020 21:05:43 +0100 Cc: Mitchell Horne , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <61D3797D-88AD-4005-9DB7-E08B207D666D@FreeBSD.org> References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> To: Ed Maste X-Mailer: Apple Mail (2.3608.80.23.2.2) X-Rspamd-Queue-Id: 49t9xQ5YYzz4XKM X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of r@robakdesign.com has no SPF policy when checking 209.85.221.45) smtp.mailfrom=r@robakdesign.com X-Spamd-Result: default: False [1.79 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; FORGED_SENDER(0.30)[robak@FreeBSD.org,r@robakdesign.com]; RECEIVED_SPAMHAUS_PBL(0.00)[51.6.235.102:received]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(0.62)[subject]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[robak@FreeBSD.org,r@robakdesign.com]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.70)[-0.695]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.25)[0.246]; NEURAL_HAM_LONG(-0.08)[-0.084]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[FreeBSD.org]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.45:from]; R_SPF_NA(0.00)[no SPF record]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.45:from]; RCVD_TLS_ALL(0.00)[] 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 20:05:49 -0000 > On 25 Jun 2020, at 21:02, Ed Maste wrote: >=20 > On Thu, 25 Jun 2020 at 09:48, Mitchell Horne = wrote: >>=20 >> We should advise users to set pull.rebase in their configuration, >> either globally in ~/.gitconfig or on the repository-level in >> .git/config. It seems that newer versions of git will print a warning >> if neither pull.ff or pull.rebase is set. It's unfortunate that we >> can't include config files as part of the repository, so this will >> always need to be done manually. >=20 > I agree it's unfortunate we can't set repository-level defaults that > come along with the initial clone. We could have a script though that > users can run to display or adjust the appropriate settings, perhaps. > Our standard quickstart instructions could be something like >=20 > % git clone foo@cgit-beta.freebsd.org/src.git > % cd src > % sh tools/git-repo-init.sh Why can't we ship the gitconfig file inside of the repository containing = the defaults we'd like to be used? Kind regards, Bartek Rutkowski From owner-freebsd-git@freebsd.org Thu Jun 25 20:11:43 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 CB70F3444F1 for ; Thu, 25 Jun 2020 20:11:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49tB4H28T5z4XQX; Thu, 25 Jun 2020 20:11:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f50.google.com with SMTP id h4so7457635ior.5; Thu, 25 Jun 2020 13:11:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=zJGMjTp3Bw1QipvR3tr7okFY1bKiPSK/f1dreky7880=; b=GGyKMM6Y7HRntpHM6VyhHZgde+C0K1rPtPyLBt2prYVDKPbAonm7ZjAZi5pc+txIGx Bm/M2jH59QdM8qKhJGtD0RIjzWBbMOPDgBKuLcQ6rNG1yWRaQecCox3/4RPRDQtIMkQT svN4QLE6dngduLBNzMu09gSPmwH2p3tSERsuhZMtJnHVMCOGp6TPru2tPplMbHMLxlty sjVej1dUhVikyqguxhrXEmChLtwpYQt2d+yEOfM5odSwKQHg8Nlvha21T/EPtRITP7BZ /dT5SJMQFPIMa6/OCI/cOBSMiOb2qLybDPNcLhNOzGSLLH65fPznPVhS5VOzHd8DfOqX p/3g== X-Gm-Message-State: AOAM5334VTfk74Ns+sk5dD1J/TT72SuoEDmODf9CngUTjEOybqliiC10 IOIvTe+3tv5N9q+4HcSPOWQKU5Rh0//eMMDLyrEV4Q== X-Google-Smtp-Source: ABdhPJxh/l6NKOht9lvhPNiuva06dkAa4h2n6VzWyLxDweHyzLQ2FDh5WP2GqX9cz7/vmdCPyn1VMbs9ZzSN8WnPWsA= X-Received: by 2002:a05:6638:dd3:: with SMTP id m19mr38204332jaj.106.1593115901630; Thu, 25 Jun 2020 13:11:41 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <61D3797D-88AD-4005-9DB7-E08B207D666D@FreeBSD.org> In-Reply-To: <61D3797D-88AD-4005-9DB7-E08B207D666D@FreeBSD.org> From: Ed Maste Date: Thu, 25 Jun 2020 16:11:29 -0400 Message-ID: Subject: Re: svn primer translation to git To: =?UTF-8?Q?Bart=C5=82omiej_Rutkowski?= Cc: Mitchell Horne , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49tB4H28T5z4XQX X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] 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 20:11:43 -0000 On Thu, 25 Jun 2020 at 16:05, Bart=C5=82omiej Rutkowski = wrote: > > Why can't we ship the gitconfig file inside of the repository containing = the defaults > we'd like to be used? The standard per-repo config is .git/config, which is not part of the repo itself. We could use includes or such (e.g. including ../.gitconfig from .git/config) but setting that up would still be a separate step after the clone. From owner-freebsd-git@freebsd.org Fri Jun 26 10:45:54 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 E21F93544C8 for ; Fri, 26 Jun 2020 10:45:54 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 49tYSy5Svmz4RS1; Fri, 26 Jun 2020 10:45:54 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 9B15615404; Fri, 26 Jun 2020 10:45:54 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:fa75:a4ff:fea6:9f8f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 5BB0B942D81; Fri, 26 Jun 2020 10:45:52 +0000 (UTC) Date: Fri, 26 Jun 2020 12:45:51 +0200 From: Mathieu Arnold To: Dan Langille Cc: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <20200626104551.uvz6reexkh33myrg@aching.in.mat.cc> References: <20200625165547.GA75705@spindle.one-eyed-alien.net> <20200625171314.GB75705@spindle.one-eyed-alien.net> <20200625180621.GC75705@spindle.one-eyed-alien.net> <78984441-460D-477F-939A-9F7237DAD757@langille.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ob3nznqgqmjkus5b" Content-Disposition: inline In-Reply-To: <78984441-460D-477F-939A-9F7237DAD757@langille.org> 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: Fri, 26 Jun 2020 10:45:54 -0000 --ob3nznqgqmjkus5b Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 25, 2020 at 02:10:59PM -0400, Dan Langille wrote: > > On Jun 25, 2020, at 2:06 PM, Brooks Davis wrote: > >=20 > > There's a time and place for many foot cannons, but there's no need to > > even mention them in our documentation unless it's completely essential. > > People can explore the infinite vastness of git options on their own. >=20 > There ^ >=20 > Limit the primer to the usual work flow that committer should follow. >=20 > Put unusual workflows to other documentation. >=20 > Show me how to get the ports tree, make a change, check it in. >=20 > Cover common things we used to do, and how to do them now. >=20 > For example svn cp, when moving something in the ports tree > (say from one category to another). What do we do with git? That is something we need to decide. git does not track copies and moves, it only tries to figure it out after the fact. So, we could decide we don't care about history and just copy files around and change them. We could try to help git by creating a short term branch where you first copy the files, commit, then modifiy them, commit, then merge without fast forward. Or we could do something else entirely. --=20 Mathieu Arnold --ob3nznqgqmjkus5b Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl710dpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgIxkg/+PS/36CarSqLc9w3i/CbKvyJ9ZeBCjRTL9kLUPOovF0Qq3Z37PY7xw+tN OW9mP76+64bJNDkIVYFUpzL1WmzAla8fGU2I4JtgMxKl5d5z6u5rngKNDfr0tLvx lPNNhu/V7kVbT8dkhxIwFCJ0JSl1EYil+p1ABqqJteVxdBcX45vgbrUNr0Cv7Oah fbgUWBEpALbhaTZUX+WlOrHk0csrtEpRGYk0X0K3P2a+xZLis2SPdc73lxnx5cyc 72kfIBWXRoA9OxThAAT67XgF7lhVbHRF4jeRtovXKPG6H+C8TKukWaCBsReOgo3O sMzUi70SLDKPOHBm5KJIKoHSmhBBQr50uDlPcLXFQdSxcmau5+SpmaPaR+P51ePx MtPQCX3J8ZIbBcocuMruzYi6l0KPZlvleJWwApyw0cNVplgTi2lyrTrKuBnDcc8N osWUFALKIsU3tqda/FGzld/w9M9Cqc9+UrMKISJTfGCKnmlFDE7B2hnsXQYoS9Da NaxCKTMlfxg3R4SPHHN6uMjq1PNwJztzmIysmFtciZMzFs9KHByc+BHsrvW9oT7A kt9NYzHD3PsycetskyEdiB3BfSUHlmUTl9+MD4FS6oRcFLXXGJtf+Ttsd64Hhb7z 50pbipE2iza7uRZTzPrAkJSaMoYSYjbg28oaJMPtnjvblrDFb0w= =2gQr -----END PGP SIGNATURE----- --ob3nznqgqmjkus5b-- From owner-freebsd-git@freebsd.org Fri Jun 26 13:29:41 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 96CF1357E63 for ; Fri, 26 Jun 2020 13:29:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 49td5x3VYmz4d3X; Fri, 26 Jun 2020 13:29:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (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 60146165F4; Fri, 26 Jun 2020 13:29:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [192.168.43.233] (unknown [77.63.25.37]) (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 805B66E0E4; Fri, 26 Jun 2020 15:29:39 +0200 (CEST) From: Dimitry Andric Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_0E821894-EA35-4762-9A52-9370AD5E0C39"; 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: Fri, 26 Jun 2020 15:29:23 +0200 In-Reply-To: <20200626104551.uvz6reexkh33myrg@aching.in.mat.cc> Cc: Dan Langille , freebsd-git@freebsd.org To: Mathieu Arnold References: <20200625165547.GA75705@spindle.one-eyed-alien.net> <20200625171314.GB75705@spindle.one-eyed-alien.net> <20200625180621.GC75705@spindle.one-eyed-alien.net> <78984441-460D-477F-939A-9F7237DAD757@langille.org> <20200626104551.uvz6reexkh33myrg@aching.in.mat.cc> 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: Fri, 26 Jun 2020 13:29:41 -0000 --Apple-Mail=_0E821894-EA35-4762-9A52-9370AD5E0C39 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 26 Jun 2020, at 12:45, Mathieu Arnold wrote: >=20 > On Thu, Jun 25, 2020 at 02:10:59PM -0400, Dan Langille wrote: >>> On Jun 25, 2020, at 2:06 PM, Brooks Davis = wrote: >>>=20 >>> There's a time and place for many foot cannons, but there's no need = to >>> even mention them in our documentation unless it's completely = essential. >>> People can explore the infinite vastness of git options on their = own. >>=20 >> There ^ >>=20 >> Limit the primer to the usual work flow that committer should follow. >>=20 >> Put unusual workflows to other documentation. >>=20 >> Show me how to get the ports tree, make a change, check it in. >>=20 >> Cover common things we used to do, and how to do them now. >>=20 >> For example svn cp, when moving something in the ports tree >> (say from one category to another). What do we do with git? >=20 > That is something we need to decide. >=20 > git does not track copies and moves, it only tries to figure it out > after the fact. >=20 Indeed, and it can also show it in the UI, for example this commit by jkim: = https://cgit-beta.freebsd.org/src/commit/?id=3D135e722187e762111e66b94cb15= 9a4daabb9bd4c It doesn't "see" that README was renamed to README.md and subsequently modified, but it does follow the renames of a bunch of source files from contrib/flex/ to contrib/flex/src/. -Dimitry --Apple-Mail=_0E821894-EA35-4762-9A52-9370AD5E0C39 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 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXvX4MwAKCRCwXqMKLiCW o4B3AKC92ZHpMCwsbt+gugLVdVOV80535wCeJkEdhocFFIXAJFkdLzUBtXUoPuM= =xzOU -----END PGP SIGNATURE----- --Apple-Mail=_0E821894-EA35-4762-9A52-9370AD5E0C39--