From owner-freebsd-git@freebsd.org Sun Feb 28 11:34:42 2021 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 7F44C568E14 for ; Sun, 28 Feb 2021 11:34:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4DpLsG39mJz3kfx for ; Sun, 28 Feb 2021 11:34:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 6B0C0568E13; Sun, 28 Feb 2021 11:34:42 +0000 (UTC) Delivered-To: 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 6AC15568E12 for ; Sun, 28 Feb 2021 11:34:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DpLsF741kz3klr for ; Sun, 28 Feb 2021 11:34:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 11SBYVQt068062 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 28 Feb 2021 12:34:32 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 28 Feb 2021 12:34:31 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday yet again Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DpLsF741kz3klr 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:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 28 Feb 2021 11:34:42 -0000 On Mon, 2021-02-22 at 11:25:45 +0100, Ulrich Spörlein wrote: >Hey folks, me again with the bi-monthly reminder that ports' hashes will >change due to an authorname change. > >Affected will be all commits _after_ Feb 10. All earlier history will >remain the same. > >By now you know the drill, rebasing should be trivial and merging should >mostly work out of the box, as the window of divergence is rather small. > >Please let me know if you will need help with any of that. I hope to >push the changes on Feb 28th. > >Cheers >Uli This has been committed and the changes should hit the various mirrors any minute now. Sorry again for the inconvenience. Uli - looking forward to finally getting this over with From owner-freebsd-git@freebsd.org Mon Mar 1 23:56:26 2021 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 714DB550A32 for ; Mon, 1 Mar 2021 23:56:26 +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 4DqHGc6NG4z4Vy5; Mon, 1 Mar 2021 23:56:24 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id C79073C0199; Mon, 1 Mar 2021 23:56:18 +0000 (UTC) Date: Mon, 1 Mar 2021 23:56:18 +0000 From: Brooks Davis To: Rene Ladan Cc: Brandon Bergren , John Mehr via freebsd-git Subject: Re: Ports Repocopy Message-ID: <20210301235618.GD50170@spindle.one-eyed-alien.net> References: <202102221945.11MJjCiO063445@slippy.cwsent.com> <20210222211032.GA21063@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8NvZYKFJsRX2Djef" Content-Disposition: inline In-Reply-To: <20210222211032.GA21063@freefall.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4DqHGc6NG4z4Vy5 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.90 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[199.48.129.229:from]; FREEFALL_USER(0.00)[brooks]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[199.48.129.229:from:127.0.2.255]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Mon, 01 Mar 2021 23:56:26 -0000 --8NvZYKFJsRX2Djef Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 22, 2021 at 09:10:32PM +0000, Rene Ladan wrote: > On Mon, Feb 22, 2021 at 02:46:40PM -0600, Brandon Bergren wrote: > > On Mon, Feb 22, 2021, at 1:45 PM, Cy Schubert wrote: > > > When ports switches to GIT, given that there is no GIT equivalent to = svn=20 > > > copy will repocopy become a thing of the past? Will we live with this= or=20 > > > will there be some kind of procedure ports committers must follow to= =20 > > > approximate a repocopy? > > >=20 > >=20 > > Renames and copies in git are inferred, not tracked. > >=20 > > About all you can do to make following stuff easier across a copy is to= cp -a and immediately commit, before making any changes, so that it shows = up in the index with identical file hashes as what it was copied from. > >=20 > > Following a file's history across a copy is dependent on the settings t= he person looking at the history is using. > >=20 > > It is not enabled by default because it is an extremely expensive opera= tion -- it is O(n^2) where n is the number of files in the tree, plus even = then it only works if the original file was modified in the same commit. Ot= herwise you have to use --find-copies-harder which is an even more expensiv= e option. > >=20 > > If the commit was done by committing an unmodified version first, you c= an theoretically use `git log --follow -C100% --find-copies-harder ` which should probably be able to do its work without having to compute = similarities on all of the objects. But if you have many files with the sam= e contents, I don't really know what the log will look like past that point= =2E I *think* it will just randomly mix history. I haven't tested it though. > >=20 > > I suppose writing a tool that adds metadata about the copy to a git not= e or something would be the best way to track this stuff... >=20 > Hm, or just write something at the bottom of the commit message, like > cherry-pick -x does? I remmber that emaste suggested something like this > in the last git working group meeting. For simple cases like copying one port or resurrecting one port, I think the easiest thing to do is to cause the new copy to exist in one commit (but don't hook it up) and then update it. E.g.,=20 resurrection: git revert --no-commit git revert --continue (or whatever the equivalent is) git add + git commit copying: git cp cat/port cat/portng git commit cat/portng git add + git commit This gives git the best chance to infer the right history by ensuring identical files are copied. I think the copying case will work better than resurrection from a tooling perspective. Resurrection will likely go best if ports are deleted in independent commits rather than in one big one during expiration. -- Brooks --8NvZYKFJsRX2Djef Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJgPX8iAAoJEKzQXbSebgfAGFoH/0S/nvbjHjOL9bv3NWl5v/vI Yafx3E+5+AhCR9UK7+vIqa696+ZAqac4GW919kNaLjmPU6gTWrtwnHanY9meomc4 IC8Z+C0pDE4Un1OKu4SEJGUJgzDBYdM+sGZW8x1TL4u6pzXRvw3R7xFXTgmCn3e3 8182nfPacb8kekag7mKShTx0NQPUUyc6Z5QN/G1iZj+qmbgIuTuwvdYjdF8ma370 BmvJVtP17s2GsQVA6E55WAGd+GUdUL/JyzqeQKkafQAqkrIUxJDsg+0xzJB/kGkZ Gt0OvF5pZqWLvh4NnoP4E8X3j9IRUM+LI8bWzb3zkg1Q/hwpW91O0a9dPpEUYkM= =8UQj -----END PGP SIGNATURE----- --8NvZYKFJsRX2Djef-- From owner-freebsd-git@freebsd.org Tue Mar 2 09:12:47 2021 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 CCC47562149 for ; Tue, 2 Mar 2021 09:12:47 +0000 (UTC) (envelope-from rene@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DqWcb5T2nz3LLP; Tue, 2 Mar 2021 09:12:47 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1614676367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yuqz//QAND/2aYPHmRoDxL0lYnyp9PpPENMCBolF50Q=; b=hvG0L5R59k82Uyeiz4D6vPTYTadvihJNu59b3LaY3NjOYTzc4OKuQTLWI8Ao4O3hkrz8Rr 83kmBLheZPTiksNOt4MJFWZQxelZacKHV0IE8ELJBnnDfnvFSBYCwl7fWQP6ZhWrmJa7gj sdGqKFZFAWPIWww3y8efTONpMv4Amuu/vNQVdA4j6x5YtX5QBHh28+7n5ZiByKTU07CNXc 5quYQ3HpWsu0Pm0KBh4vVYFbh/d7inv4C4KBi8FS0mLWO6R9ejQpKYhgs4uxY0Z/aiScZ3 jn3eeCzMP+zJ6FgS0spLn9ee9qhIQA8oQ1kdy98hpjhrw/gNzVpXQ/Wnfax9eA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id ACDB31A14C; Tue, 2 Mar 2021 09:12:47 +0000 (UTC) Date: Tue, 2 Mar 2021 09:12:47 +0000 From: Rene Ladan To: Brooks Davis Cc: Brandon Bergren , John Mehr via freebsd-git Subject: Re: Ports Repocopy Message-ID: <20210302091247.GA97315@freefall.freebsd.org> References: <202102221945.11MJjCiO063445@slippy.cwsent.com> <20210222211032.GA21063@freefall.freebsd.org> <20210301235618.GD50170@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210301235618.GD50170@spindle.one-eyed-alien.net> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1614676367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yuqz//QAND/2aYPHmRoDxL0lYnyp9PpPENMCBolF50Q=; b=bW25CFJtmOXIZsMUCjnQMqgaldkLxc641RqngeDGSfywocgUaMjsl/67n9j344h2PkzGFQ awjdUHh2cK/qzAUlb+FHg4er/WAkHGknSqYcif5zxru8KKZmqQDTiuvZZq9tkcELDWfSbq slcGLzDkl08o4CBuJl1DzBOK4b1WxHaRkSXAidex0wdB/03I/LE/8Reeps7HyoEvuKETFZ 2T1NBOja2vM6WuzWZW69GRU7FNA6g1SRemwR2pd6hyE6gaeGi7wzZK70lKsw3RCbyZaLPX 6kdQk/QhQ8UqTv+yoTcZB0K2yl7Q0bU0BIlcrSeTeWEqXnTelEXNgtK8qjB9Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1614676367; a=rsa-sha256; cv=none; b=gtD1GnS662pJMyWsdt1Ox95BumylGNXobnffPFq6pFzIo/hI3zI4wR9v5o7uH7GgXrrPO5 sTT7ayWSWtUlrlX+CrMe10uacJK3+51xf58VKD8MISokutIRg7zYZcSapqZUsTn6mph+V3 OpVJDluBO9eTvNLP1oIZks3/NPL5Ew1YVYHVMSJE6gZND4RwGuLBSqOWpdrsyYhNHHxMSZ +fOCfMogQfi9RpFKmRnAXhmebCLmNMJzVh9zl2KJKXW1WE1SR+P1py92TbOS3Z75GHM1kT zhS2BH9eaK0GeiDL1tgqOlhWU+g21nbl83aN4BE1fv1c2mBRLXtZHhB7PyUMDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 02 Mar 2021 09:12:47 -0000 On Mon, Mar 01, 2021 at 11:56:18PM +0000, Brooks Davis wrote: > On Mon, Feb 22, 2021 at 09:10:32PM +0000, Rene Ladan wrote: > > On Mon, Feb 22, 2021 at 02:46:40PM -0600, Brandon Bergren wrote: > > > On Mon, Feb 22, 2021, at 1:45 PM, Cy Schubert wrote: > > > > When ports switches to GIT, given that there is no GIT equivalent to svn > > > > copy will repocopy become a thing of the past? Will we live with this or > > > > will there be some kind of procedure ports committers must follow to > > > > approximate a repocopy? > > > > > > > > > > Renames and copies in git are inferred, not tracked. > > > > > > About all you can do to make following stuff easier across a copy is to cp -a and immediately commit, before making any changes, so that it shows up in the index with identical file hashes as what it was copied from. > > > > > > Following a file's history across a copy is dependent on the settings the person looking at the history is using. > > > > > > It is not enabled by default because it is an extremely expensive operation -- it is O(n^2) where n is the number of files in the tree, plus even then it only works if the original file was modified in the same commit. Otherwise you have to use --find-copies-harder which is an even more expensive option. > > > > > > If the commit was done by committing an unmodified version first, you can theoretically use `git log --follow -C100% --find-copies-harder ` which should probably be able to do its work without having to compute similarities on all of the objects. But if you have many files with the same contents, I don't really know what the log will look like past that point. I *think* it will just randomly mix history. I haven't tested it though. > > > > > > I suppose writing a tool that adds metadata about the copy to a git note or something would be the best way to track this stuff... > > > > Hm, or just write something at the bottom of the commit message, like > > cherry-pick -x does? I remmber that emaste suggested something like this > > in the last git working group meeting. > > For simple cases like copying one port or resurrecting one port, I think > the easiest thing to do is to cause the new copy to exist in one commit > (but don't hook it up) and then update it. E.g., > > resurrection: > git revert --no-commit > > git revert --continue (or whatever the equivalent is) > > git add + git commit > > copying: > git cp cat/port cat/portng Alas, there is no "git cp", only "git mv". Or did you mean a plain "cp"? > git commit cat/portng > > git add + git commit > > This gives git the best chance to infer the right history by ensuring > identical files are copied. I think the copying case will work better > than resurrection from a tooling perspective. Resurrection will likely go > best if ports are deleted in independent commits rather than in one big > one during expiration. > Hm, the git version of rmport still creates one big commit when removing multiple ports, but I can probably change that to individual commits (and one push at the end). René From owner-freebsd-git@freebsd.org Tue Mar 2 12:24:18 2021 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 6B18A5680C9 for ; Tue, 2 Mar 2021 12:24:18 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [91.121.41.56]) (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 4DqbsY2qdDz3p9K for ; Tue, 2 Mar 2021 12:24:17 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f01:6201:5073:d735:abc8:920] (p200300fB4F0162015073D735abc80920.dip0.t-ipconnect.de [IPv6:2003:fb:4f01:6201:5073:d735:abc8:920]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4DqbsP1RBwzXK8 for ; Tue, 2 Mar 2021 13:24:09 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: ports and git, first steps Message-Id: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> Date: Tue, 2 Mar 2021 13:23:56 +0100 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DqbsY2qdDz3p9K X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 91.121.41.56) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[91.121.41.56:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[91.121.41.56:from:127.0.2.255]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[ellael.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:91.121.0.0/16, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 02 Mar 2021 12:24:18 -0000 Hi, I am running STABLE-13 and use poudriere (svn+https) to compile my ports = of interest. Disclaimer: I do consider myself a newbie with regard to git. After my migration from svn to git regarding sources, I recently = installed a git repository for ports sources. It is working as expected, = good. But then I added some local ports to the ports directory, which I added = to .git/info/exclude. Ok, that worked out. Now I had had to modify the Makefile of www/wordpress like I did before = in the svn ports tree. Now git complained: mwn> git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working = directory) modified: www/wordpress/Makefile It took 3.44 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). no changes added to commit (use "git add" and/or "git commit = -a") Thus I applied 'git commit': mwn> git commit -a -m "modified to compile wordpress without = llvm" [master 39b5d0652] modified to compile wordpress without llvm Committer: admin mer-waases.net Your name and email address were configured automatically based on your username and hostname. Please check that they are = accurate. You can suppress this message by setting them explicitly. Run = the following command and follow the instructions in your editor to = edit your configuration file: git config --global =E2=80=94edit After doing this, you may fix the identity used for this commit = with: git commit --amend --reset-author =09 1 file changed, 1 insertion(+), 1 deletion(-) Now, 'git status' shows: mwn> git status On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) It took 3.17 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). nothing to commit, working tree clean Well, that looks fine for a git newbie, But there are some questions = left for me: 1) Will my commited Makefile become overwritten if the master Makefile = becomes modified in the future? (I hope so) 2) Will all upcoming modifications in = 'remote.origin.url=3Dgit://github.com/freebsd/freebsd-ports.git' be = pulled, although 'Your branch is ahead of 'origin/master' by 1 commit.'? 3) Is there a better, more suited way to deal with local modifications? 4) In analogy to the recommendations for src and git, I did run 'git = config pull.ff only'. Is that wrong when it comes to ports (I do not understand what that = means, yet) Thanks and regards, Michael From owner-freebsd-git@freebsd.org Tue Mar 2 19:51:47 2021 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 92D7254EBE6 for ; Tue, 2 Mar 2021 19:51:47 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dqnnv1g37z3GvR for ; Tue, 2 Mar 2021 19:51:47 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 122JpRv7091301 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 2 Mar 2021 20:51:30 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Tue, 2 Mar 2021 20:51:27 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Michael Grimm Cc: freebsd-git@freebsd.org Subject: Re: ports and git, first steps Message-ID: References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4Dqnnv1g37z3GvR X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 02 Mar 2021 19:51:47 -0000 On Tue, 2021-03-02 at 13:23:56 +0100, Michael Grimm wrote: >Hi, > >I am running STABLE-13 and use poudriere (svn+https) to compile my ports of interest. > >Disclaimer: I do consider myself a newbie with regard to git. > >After my migration from svn to git regarding sources, I recently installed a git repository for ports sources. It is working as expected, good. > >But then I added some local ports to the ports directory, which I added to .git/info/exclude. Ok, that worked out. > >Now I had had to modify the Makefile of www/wordpress like I did before in the svn ports tree. Now git complained: > > mwn> git status > On branch master > Your branch is up to date with 'origin/master'. > > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git restore ..." to discard changes in working directory) > modified: www/wordpress/Makefile > > It took 3.44 seconds to enumerate untracked files. 'status -uno' > may speed it up, but you have to be careful not to forget to add > new files yourself (see 'git help status'). > no changes added to commit (use "git add" and/or "git commit -a") > >Thus I applied 'git commit': > > mwn> git commit -a -m "modified to compile wordpress without llvm" > [master 39b5d0652] modified to compile wordpress without llvm > Committer: admin mer-waases.net > Your name and email address were configured automatically based > on your username and hostname. Please check that they are accurate. > You can suppress this message by setting them explicitly. Run the > following command and follow the instructions in your editor to edit > your configuration file: > > git config --global —edit > > After doing this, you may fix the identity used for this commit with: > > git commit --amend --reset-author > > 1 file changed, 1 insertion(+), 1 deletion(-) > >Now, 'git status' shows: > > mwn> git status > On branch master > Your branch is ahead of 'origin/master' by 1 commit. > (use "git push" to publish your local commits) > > > It took 3.17 seconds to enumerate untracked files. 'status -uno' > may speed it up, but you have to be careful not to forget to add > new files yourself (see 'git help status'). > nothing to commit, working tree clean > >Well, that looks fine for a git newbie, But there are some questions left for me: > >1) Will my commited Makefile become overwritten if the master Makefile becomes modified in the future? (I hope so) No, due to how I think (!) poudriere works, your change should remain. >2) Will all upcoming modifications in 'remote.origin.url=git://github.com/freebsd/freebsd-ports.git' be pulled, > although 'Your branch is ahead of 'origin/master' by 1 commit.'? I think poudriere does a `git pull --rebase` always, which fetches upstream and then rebases your changes on top. So your local changes will always be there, but they can of course come into conflict with upstream changes at which point you'll need to resolve those conflicts. >3) Is there a better, more suited way to deal with local modifications? I'm not sure. For SVN I used to have a separate myports ports collection with the uncommitted changes and I haven't switch to git ports yet. But I would just have my local diffs "on top" of upstream. >4) In analogy to the recommendations for src and git, I did run 'git config pull.ff only'. > Is that wrong when it comes to ports (I do not understand what that means, yet) That might actually be in conflict with the git pull --rebase that poudriere does. I assume though that the argv addition will overwrite your config setting. But in any case, for a tree with local changes on top, ff-only is the wrong choice. Either always git pull --rebase or maybe you can make rebase the default via that config (instead of -ff). hth Uli From owner-freebsd-git@freebsd.org Wed Mar 3 15:10:25 2021 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 6C0FE56D4FB; Wed, 3 Mar 2021 15:10:25 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [87.98.149.189]) (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 4DrHVm4xTVz3t5Y; Wed, 3 Mar 2021 15:10:24 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:8801:2dc2:4515:6bed:5514] (p200300FB4F0088012DC245156bed5514.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:8801:2dc2:4515:6bed:5514]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 4DrHVc1yrSzwhs; Wed, 3 Mar 2021 16:10:16 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: ports and git, first steps Date: Wed, 3 Mar 2021 16:10:15 +0100 References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DrHVm4xTVz3t5Y X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 87.98.149.189) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[87.98.149.189:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[ellael.org]; SPAMHAUS_ZRD(0.00)[87.98.149.189:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:87.98.128.0/17, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-questions] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 03 Mar 2021 15:10:25 -0000 [CC'd to freebsd-questions] Ulrich Sp=C3=B6rlein wrote: > On Tue, 2021-03-02 at 13:23:56 +0100, Michael Grimm wrote: >> I am running STABLE-13 and use poudriere (svn+https) to compile my = ports of interest. >>=20 >> Disclaimer: I do consider myself a newbie with regard to git. >>=20 >> After my migration from svn to git regarding sources, I recently = installed a git repository for ports sources. It is working as expected, = good. >>=20 >> But then I added some local ports to the ports directory, which I = added to .git/info/exclude. Ok, that worked out. >>=20 >> Now I had had to modify the Makefile of www/wordpress like I did = before in the svn ports tree. Now git complained: >>=20 >> mwn> git status >> On branch master >> Your branch is up to date with 'origin/master'. >>=20 >> Changes not staged for commit: >> (use "git add ..." to update what will be committed) >> (use "git restore ..." to discard changes in working = directory) >> modified: www/wordpress/Makefile >>=20 >> It took 3.44 seconds to enumerate untracked files. 'status -uno' >> may speed it up, but you have to be careful not to forget to add >> new files yourself (see 'git help status'). >> no changes added to commit (use "git add" and/or "git commit = -a") >>=20 >> Thus I applied 'git commit': >>=20 >> mwn> git commit -a -m "modified to compile wordpress without = llvm" >> [master 39b5d0652] modified to compile wordpress without llvm >> Committer: admin mer-waases.net >> Your name and email address were configured automatically based >> on your username and hostname. Please check that they are = accurate. >> You can suppress this message by setting them explicitly. Run = the >> following command and follow the instructions in your editor to = edit >> your configuration file: >>=20 >> git config --global =E2=80=94edit >>=20 >> After doing this, you may fix the identity used for this commit = with: >>=20 >> git commit --amend --reset-author >> =09 >> 1 file changed, 1 insertion(+), 1 deletion(-) >>=20 >> Now, 'git status' shows: >>=20 >> mwn> git status >> On branch master >> Your branch is ahead of 'origin/master' by 1 commit. >> (use "git push" to publish your local commits) >>=20 >>=20 >> It took 3.17 seconds to enumerate untracked files. 'status -uno' >> may speed it up, but you have to be careful not to forget to add >> new files yourself (see 'git help status'). >> nothing to commit, working tree clean >>=20 >> Well, that looks fine for a git newbie, But there are some questions = left for me: >>=20 >> 1) Will my commited Makefile become overwritten if the master = Makefile becomes modified in the future? (I hope so) >=20 > No, due to how I think (!) poudriere works, your change should remain. >=20 >> 2) Will all upcoming modifications in = 'remote.origin.url=3Dgit://github.com/freebsd/freebsd-ports.git' be = pulled, >> although 'Your branch is ahead of 'origin/master' by 1 commit.'? >=20 > I think poudriere does a `git pull --rebase` always, which fetches = upstream and then rebases your changes on top. So your local changes = will always be there, but they can of course come into conflict with = upstream changes at which point you'll need to resolve those conflicts. Does anyone know if poudriere is using 'git pull =E2=80=94rebase' as = default? >> 3) Is there a better, more suited way to deal with local = modifications? >=20 > I'm not sure. For SVN I used to have a separate myports ports = collection with the uncommitted changes and I haven't switch to git = ports yet. But I would just have my local diffs "on top" of upstream. Ok, I did create a local port instead, and modified the Makefile there. = Now my modification is no longer leading to the 'issue' mentionend = above. >> 4) In analogy to the recommendations for src and git, I did run 'git = config pull.ff only'. >> Is that wrong when it comes to ports (I do not understand what that = means, yet) >=20 > That might actually be in conflict with the git pull --rebase that = poudriere does. I assume though that the argv addition will overwrite = your config setting. But in any case, for a tree with local changes on = top, ff-only is the wrong choice. Either always git pull --rebase or = maybe you can make rebase the default via that config (instead of -ff). I did remove this setting from .git/config. Now poudriere is the only = process dealing with pulls. > hth Yes, very much appreciated. Thanks and regards, Michael From owner-freebsd-git@freebsd.org Thu Mar 4 12:13:38 2021 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 767BB56F5D1; Thu, 4 Mar 2021 12:13:38 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrqXL0Jqjz3PKb; Thu, 4 Mar 2021 12:13:37 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 124CDFFM023671 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 4 Mar 2021 13:13:17 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 4 Mar 2021 13:13:15 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Michael Grimm Cc: freebsd-git@freebsd.org, freebsd-questions@freebsd.org Subject: Re: ports and git, first steps Message-ID: Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= , Michael Grimm , freebsd-git@freebsd.org, freebsd-questions@freebsd.org References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DrqXL0Jqjz3PKb 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:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 04 Mar 2021 12:13:38 -0000 On Wed, 2021-03-03 at 16:10:15 +0100, Michael Grimm wrote: >[CC'd to freebsd-questions] > >Ulrich Spörlein wrote: >> On Tue, 2021-03-02 at 13:23:56 +0100, Michael Grimm wrote: > >>> I am running STABLE-13 and use poudriere (svn+https) to compile my ports of interest. >>> >>> Disclaimer: I do consider myself a newbie with regard to git. >>> >>> After my migration from svn to git regarding sources, I recently installed a git repository for ports sources. It is working as expected, good. >>> >>> But then I added some local ports to the ports directory, which I added to .git/info/exclude. Ok, that worked out. >>> >>> Now I had had to modify the Makefile of www/wordpress like I did before in the svn ports tree. Now git complained: >>> >>> mwn> git status >>> On branch master >>> Your branch is up to date with 'origin/master'. >>> >>> Changes not staged for commit: >>> (use "git add ..." to update what will be committed) >>> (use "git restore ..." to discard changes in working directory) >>> modified: www/wordpress/Makefile >>> >>> It took 3.44 seconds to enumerate untracked files. 'status -uno' >>> may speed it up, but you have to be careful not to forget to add >>> new files yourself (see 'git help status'). >>> no changes added to commit (use "git add" and/or "git commit -a") >>> >>> Thus I applied 'git commit': >>> >>> mwn> git commit -a -m "modified to compile wordpress without llvm" >>> [master 39b5d0652] modified to compile wordpress without llvm >>> Committer: admin mer-waases.net >>> Your name and email address were configured automatically based >>> on your username and hostname. Please check that they are accurate. >>> You can suppress this message by setting them explicitly. Run the >>> following command and follow the instructions in your editor to edit >>> your configuration file: >>> >>> git config --global —edit >>> >>> After doing this, you may fix the identity used for this commit with: >>> >>> git commit --amend --reset-author >>> >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> Now, 'git status' shows: >>> >>> mwn> git status >>> On branch master >>> Your branch is ahead of 'origin/master' by 1 commit. >>> (use "git push" to publish your local commits) >>> >>> >>> It took 3.17 seconds to enumerate untracked files. 'status -uno' >>> may speed it up, but you have to be careful not to forget to add >>> new files yourself (see 'git help status'). >>> nothing to commit, working tree clean >>> >>> Well, that looks fine for a git newbie, But there are some questions left for me: >>> >>> 1) Will my commited Makefile become overwritten if the master Makefile becomes modified in the future? (I hope so) >> >> No, due to how I think (!) poudriere works, your change should remain. >> >>> 2) Will all upcoming modifications in 'remote.origin.url=git://github.com/freebsd/freebsd-ports.git' be pulled, >>> although 'Your branch is ahead of 'origin/master' by 1 commit.'? >> >> I think poudriere does a `git pull --rebase` always, which fetches upstream and then rebases your changes on top. So your local changes will always be there, but they can of course come into conflict with upstream changes at which point you'll need to resolve those conflicts. > >Does anyone know if poudriere is using 'git pull —rebase' as default? It's just a bunch of shell scripts, so easy to check: % git grep GIT_CMD src/share/poudriere/common.sh:: ${GIT_CMD:=git} src/share/poudriere/jail.sh: ${GIT_CMD} clone ${GIT_DEPTH} -q -b ${VERSION} ${GIT_FULLURL} ${SRC_BASE} || err 1 " fail" src/share/poudriere/jail.sh: ${GIT_CMD} -C ${SRC_BASE} pull --rebase -q || err 1 " fail" src/share/poudriere/jail.sh: ${GIT_CMD} checkout -q "${TORELEASE}" || err 1 " fail" src/share/poudriere/jail.sh: git_sha=$(${GIT_CMD} -C ${SRC_BASE} rev-parse --short HEAD) src/share/poudriere/ports.sh: ${GIT_CMD} clone --depth=1 --single-branch ${quiet} -b ${BRANCH} ${GIT_FULLURL} ${PTMNT} || err 1 " fail" src/share/poudriere/ports.sh: ${GIT_CMD} -C ${PORTSMNT:-${PTMNT}} pull --rebase ${quiet} Besides, `git pull --rebase` is pretty much the only sane choice for poudriere anyway. Cheers Uli From owner-freebsd-git@freebsd.org Thu Mar 4 13:46:26 2021 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 5F64554A58D; Thu, 4 Mar 2021 13:46:26 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [IPv6:2001:41d0:401:2100::e48]) (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 4DrsbP4Tq8z3mlL; Thu, 4 Mar 2021 13:46:25 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:9901:5d06:454:6d8:6a25] (p200300fb4F0099015D06045406D86a25.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:9901:5d06:454:6d8:6a25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 4DrsbD0Vjdz182V; Thu, 4 Mar 2021 14:46:16 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: ports and git, first steps Date: Thu, 4 Mar 2021 14:46:13 +0100 References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org In-Reply-To: Message-Id: <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DrsbP4Tq8z3mlL X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:401:2100::e48) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:401:2100::e48:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[ellael.org]; SPAMHAUS_ZRD(0.00)[2001:41d0:401:2100::e48:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-questions] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 04 Mar 2021 13:46:26 -0000 Ulrich Sp=C3=B6rlein wrote: > On Wed, 2021-03-03 at 16:10:15 +0100, Michael Grimm wrote: >> Does anyone know if poudriere is using 'git pull =E2=80=94rebase' as = default? >=20 > It's just a bunch of shell scripts, so easy to check: >=20 > % git grep GIT_CMD > src/share/poudriere/common.sh:: ${GIT_CMD:=3Dgit} > src/share/poudriere/jail.sh: ${GIT_CMD} clone = ${GIT_DEPTH} -q -b ${VERSION} ${GIT_FULLURL} ${SRC_BASE} || err 1 " = fail" > src/share/poudriere/jail.sh: ${GIT_CMD} -C = ${SRC_BASE} pull --rebase -q || err 1 " fail" > src/share/poudriere/jail.sh: ${GIT_CMD} = checkout -q "${TORELEASE}" || err 1 " fail" > src/share/poudriere/jail.sh: git_sha=3D$(${GIT_CMD} -C = ${SRC_BASE} rev-parse --short HEAD) > src/share/poudriere/ports.sh: ${GIT_CMD} clone = --depth=3D1 --single-branch ${quiet} -b ${BRANCH} ${GIT_FULLURL} = ${PTMNT} || err 1 " fail" > src/share/poudriere/ports.sh: ${GIT_CMD} -C = ${PORTSMNT:-${PTMNT}} pull --rebase ${quiet} Sorry for the noise, I should have find out by myself :-( > Besides, `git pull --rebase` is pretty much the only sane choice for = poudriere anyway. Good to know. Now, all I need to modify is the git repository's server = name after the final migration. Thanks and regards, Michael= From owner-freebsd-git@freebsd.org Thu Mar 4 20:39:10 2021 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 6A1F75595C7; Thu, 4 Mar 2021 20:39:10 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ds2ld5ykkz4t4l; Thu, 4 Mar 2021 20:39:09 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 124Kd3fU054181 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 4 Mar 2021 21:39:05 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 4 Mar 2021 21:39:03 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Michael Grimm Cc: freebsd-git@freebsd.org, freebsd-questions@freebsd.org Subject: Re: ports and git, first steps Message-ID: Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= , Michael Grimm , freebsd-git@freebsd.org, freebsd-questions@freebsd.org References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4Ds2ld5ykkz4t4l 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:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 04 Mar 2021 20:39:10 -0000 On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote: >Ulrich Spörlein wrote: >> On Wed, 2021-03-03 at 16:10:15 +0100, Michael Grimm wrote: > >>> Does anyone know if poudriere is using 'git pull —rebase' as default? >> >> It's just a bunch of shell scripts, so easy to check: >> >> % git grep GIT_CMD >> src/share/poudriere/common.sh:: ${GIT_CMD:=git} >> src/share/poudriere/jail.sh: ${GIT_CMD} clone ${GIT_DEPTH} -q -b ${VERSION} ${GIT_FULLURL} ${SRC_BASE} || err 1 " fail" >> src/share/poudriere/jail.sh: ${GIT_CMD} -C ${SRC_BASE} pull --rebase -q || err 1 " fail" >> src/share/poudriere/jail.sh: ${GIT_CMD} checkout -q "${TORELEASE}" || err 1 " fail" >> src/share/poudriere/jail.sh: git_sha=$(${GIT_CMD} -C ${SRC_BASE} rev-parse --short HEAD) >> src/share/poudriere/ports.sh: ${GIT_CMD} clone --depth=1 --single-branch ${quiet} -b ${BRANCH} ${GIT_FULLURL} ${PTMNT} || err 1 " fail" >> src/share/poudriere/ports.sh: ${GIT_CMD} -C ${PORTSMNT:-${PTMNT}} pull --rebase ${quiet} > >Sorry for the noise, I should have find out by myself :-( > >> Besides, `git pull --rebase` is pretty much the only sane choice for poudriere anyway. > >Good to know. Now, all I need to modify is the git repository's server name after the final migration. Yes and no. It defaults to using the Github mirror and we will force-push the new content there, but `git pull --rebase` will totally barf on that, so you'll need to manually: - git fetch --prune - git checkout -B main origin/main - git branch -D master or something like that. (you need to rebase your stuff from old-master to new-main as well). We could actually bake this logic into poudriere and have it do its thing during a ports update, but it'll be rather fragile I suppose. Cheers Uli From owner-freebsd-git@freebsd.org Thu Mar 4 20:52:24 2021 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 8451E559BCA; Thu, 4 Mar 2021 20:52:24 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [IPv6:2001:41d0:302:1100::1499]) (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 4Ds32t6gR9z4vGJ; Thu, 4 Mar 2021 20:52:22 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:9901:d058:4244:d852:ecfa] (p200300Fb4F009901D0584244D852eCfa.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:9901:d058:4244:d852:ecfa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4Ds32k6kN3zykp; Thu, 4 Mar 2021 21:52:14 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: ports and git, first steps Date: Thu, 4 Mar 2021 21:52:12 +0100 References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org In-Reply-To: Message-Id: <3EF74FAB-37C0-4289-BED5-5EBDB4DFD2DF@ellael.org> X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4Ds32t6gR9z4vGJ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:302:1100::1499) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [0.22 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:302:1100::1499:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[ellael.org]; SPAMHAUS_ZRD(0.00)[2001:41d0:302:1100::1499:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.82)[0.823]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-questions] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 04 Mar 2021 20:52:24 -0000 Ulrich Sp=C3=B6rlein wrote: >=20 > On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote: >> Ulrich Sp=C3=B6rlein wrote: >>> Besides, `git pull --rebase` is pretty much the only sane choice for = poudriere anyway. >>=20 >> Good to know. Now, all I need to modify is the git repository's = server name after the final migration. >=20 > Yes and no. It defaults to using the Github mirror and we will = force-push the new content there, but `git pull --rebase` will totally = barf on that, so you'll need to manually: >=20 > - git fetch --prune > - git checkout -B main origin/main > - git branch -D master >=20 > or something like that. (you need to rebase your stuff from old-master = to new-main as well). I mentioned in the beginning that I am a newbie when it comes to git. No = I know, that I didn't downplay ;-) Most probably I will start from scratch instead, because I do not have = local commits anymore. Sidenote: the most difficult issue with git versus svn are their = completely different concepts, and, as a consequence, different concepts = to achieve related workflows. It took me some time to understand, and I = do have the feeling that I do only understand about 1% of git's = functionality, now. > We could actually bake this logic into poudriere and have it do its = thing during a ports update, but it'll be rather fragile I suppose. I don't think that there are many users that use the beta git repository = in combination of poudriere, currently. But I might be mistaken. Thanks again and with kind regards, Michael From owner-freebsd-git@freebsd.org Fri Mar 5 08:39:26 2021 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 E57DD552760 for ; Fri, 5 Mar 2021 08:39:26 +0000 (UTC) (envelope-from sasha.vigole@vigole.com) Received: from LH016.irandns.com (lh016.irandns.com [185.4.29.200]) (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 4DsLkj1zqSz3qBb for ; Fri, 5 Mar 2021 08:39:25 +0000 (UTC) (envelope-from sasha.vigole@vigole.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=vigole.com; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Date:Message-ID: Subject:From:To:Reply-To:Sender:Cc:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=7HaS+K4Fzv0t6AetBflLkqyL1HO7bYB2NIKE8JzHCo8=; b=m yNNSWuhWd0Y4ZHPvIrpSOP/lQU7LlPF7WBzdsAP5hMsSTIzUTaMCNk80lRKDivrDn0qwgV37BvGOP qAkX9tsG/dFAELUv0+HinGIJT9xr3hf35DXovBPf2ktKGJ4tH9U6QUbi03ylk8VyLcULBwKXkGyKb X6vdtVwSr1nmtE+3KOCrs8eoW4x5ymiNPf+kBhOa8FUP3dfr3DrCEWty3/fICEYkcJL1G4u1AdJBp OE7C0nWzUN0N6UYJYP6oePfn7FmKS4L2xIFCF0pG+zcW1p8yDGHWARe4i1UdcC6AplLsO4hJSGDe+ tDPEhYXdBUhHSA5yEb/HmkWkiCDBZ2NRg==; Received: from [89.196.204.3] (helo=[192.168.0.100]) by LH016.irandns.com with esmtpa (Exim 4.93.0.4) (envelope-from ) id 1lI5zQ-0004Vc-Kq for freebsd-git@freebsd.org; Fri, 05 Mar 2021 12:09:16 +0330 Reply-To: sasha.vigole@vigole.com To: freebsd-git@freebsd.org From: sasha vigole Organization: vigole Subject: The git equivalence of base/release/X.Y.0 in SVN Message-ID: <5e60fdf5-ca4c-8162-8d56-17280c7caa53@vigole.com> Date: Fri, 5 Mar 2021 12:09:09 +0330 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Authenticated-Id: sasha.vigole@vigole.com X-Rspamd-Queue-Id: 4DsLkj1zqSz3qBb X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=vigole.com header.s=x header.b=m yNNSWu; dmarc=none; spf=pass (mx1.freebsd.org: domain of sasha.vigole@vigole.com designates 185.4.29.200 as permitted sender) smtp.mailfrom=sasha.vigole@vigole.com X-Spamd-Result: default: False [-3.50 / 15.00]; HAS_REPLYTO(0.00)[sasha.vigole@vigole.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; HAS_ORG_HEADER(0.00)[]; DKIM_TRACE(0.00)[vigole.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[185.4.29.200:from]; ASN(0.00)[asn:61173, ipnet:185.4.29.0/24, country:IR]; MID_RHS_MATCH_FROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[vigole.com:s=x]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[vigole.com]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[185.4.29.200:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 05 Mar 2021 08:39:27 -0000 CQ Hallo. There are 4 branches in git: main, stable/\*, releng/\*, and vendor/\*. There is base/release/X.Y.0 in SVN. Is git going to have an equivalence? TNX 73 30 Sasha -- .sasha.vigole#mithras:arsakiden. From owner-freebsd-git@freebsd.org Fri Mar 5 08:42:13 2021 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 C171C552C60 for ; Fri, 5 Mar 2021 08:42:13 +0000 (UTC) (envelope-from sasha.vigole@vigole.com) Received: from LH016.irandns.com (lh016.irandns.com [185.4.29.200]) (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 4DsLnv562qz3qkZ for ; Fri, 5 Mar 2021 08:42:10 +0000 (UTC) (envelope-from sasha.vigole@vigole.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=vigole.com; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Date:Message-ID: Subject:From:To:Reply-To:Sender:Cc:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=VKFVS8wAWHvxd6OuhaHlT7+nUaFiW9rE2+yiL1GyaY8=; b=j p2VeS8mkYih19E3mUKFTwcwsKzZWS8fLX+oJTfpN2HSZxfgeXAo16YJl6YzGQiUPIn/G9FwKUzMaG 4x4NVAL3pbSrCQn7szbFbDkDBpdkFi5vzFakM7S8t8TKSgfDvZIO5oAqQqlf02xFB1cjm3nwfj3Ov TFZSDiIfH/I5lPD1aGuc68cZNqfl6pKA1cuhU3pcBIMfSeqfwQi6iKsdOkQimEzXXj2IC/YHTg+WW Omfflqy0qlsZxwn+KDNDrxQcKcD9O5wMcUxrcFgDH4QH712AZhYuAmnJO4bPQeCm9TjMyT3im1h3z 3gQbaEHJ4SHTc/Hde3bq0WSZD6s9lofIw==; Received: from [89.196.204.3] (helo=[192.168.0.100]) by LH016.irandns.com with esmtpa (Exim 4.93.0.4) (envelope-from ) id 1lI62F-0004eR-Tv for freebsd-git@freebsd.org; Fri, 05 Mar 2021 12:12:12 +0330 Reply-To: sasha.vigole@vigole.com To: freebsd-git@freebsd.org From: sasha vigole Subject: Using freebsd-update(8) to update /usr/src, downloaded with git(1) Organization: vigole Message-ID: <9d048b0b-62ca-6de3-d2ac-654f34429058@vigole.com> Date: Fri, 5 Mar 2021 12:12:07 +0330 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Authenticated-Id: sasha.vigole@vigole.com X-Rspamd-Queue-Id: 4DsLnv562qz3qkZ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=vigole.com header.s=x header.b=j p2VeS8; dmarc=none; spf=pass (mx1.freebsd.org: domain of sasha.vigole@vigole.com designates 185.4.29.200 as permitted sender) smtp.mailfrom=sasha.vigole@vigole.com X-Spamd-Result: default: False [-3.50 / 15.00]; HAS_REPLYTO(0.00)[sasha.vigole@vigole.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+a:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; HAS_ORG_HEADER(0.00)[]; DKIM_TRACE(0.00)[vigole.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[185.4.29.200:from]; ASN(0.00)[asn:61173, ipnet:185.4.29.0/24, country:IR]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[vigole.com:s=x]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[vigole.com]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[185.4.29.200:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 05 Mar 2021 08:42:13 -0000 CQ Hallo. Is the "src" Components in the freebsd-update.conf(5) still relevant to the FreeBSD Release. i.e. Is it possible to update /usr/src with freebsd-update(8) -- downloaded with git(1) or extracted during the installation? TNX 73 30 Sasha -- .sasha.vigole#mithras:arsakiden. From owner-freebsd-git@freebsd.org Fri Mar 5 09:11:41 2021 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 96B6F554383 for ; Fri, 5 Mar 2021 09:11:41 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (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 4DsMRw44T1z3snQ for ; Fri, 5 Mar 2021 09:11:40 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 45A8E2D70E for ; Fri, 5 Mar 2021 18:11:36 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1614935496; bh=ewkx0T4R9RlMdsMql4awQNbbQk6EBuPTeFwSvvBISUk=; h=Date:To:Subject:From:In-Reply-To:References; b=GQLEAhhJJ2J5WWZlImMQXXj+nPuWkKSxd0RJw6VXUiynqV2jsolL9os0mv1v7qlLr tENp47cNMCvRIlNPZO6pfvB+a+hYLo6g6qS7Ng8/N9vxNF6SIO1BH/n2KVq9FS7gWh adgBN/LjDLrwJxjiEAjsWGkKcVhgNPtkwpvmUa1YuXi8eohIQB47BWMWpozjNYlJPd MkWsC80rYwNauxTcZEy7bdkAAJe8s4O/kk9JLKSRGPiyIcwlSXjpruIUJWZQoOCoiO RN6fJh5zx7rS6LfILkuZuOi8Elp8l3O30goiIXllooOE0ibB5IU1ekMQAwAclZb02N xMbrEhvYXXH8w== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id EF28D2DCB2; Fri, 5 Mar 2021 18:11:33 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.1 at eastasia.home.utahime.org Date: Fri, 05 Mar 2021 18:11:19 +0900 (JST) Message-Id: <20210305.181119.312802177980145961.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Re: The git equivalence of base/release/X.Y.0 in SVN From: Yasuhiro Kimura In-Reply-To: <5e60fdf5-ca4c-8162-8d56-17280c7caa53@vigole.com> References: <5e60fdf5-ca4c-8162-8d56-17280c7caa53@vigole.com> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DsMRw44T1z3snQ X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=GQLEAhhJ; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [1.02 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; NEURAL_SPAM_SHORT(0.72)[0.723]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 05 Mar 2021 09:11:41 -0000 From: sasha vigole Subject: The git equivalence of base/release/X.Y.0 in SVN Date: Fri, 5 Mar 2021 12:09:09 +0330 > CQ Hallo. > > There are 4 branches in git: main, stable/\*, releng/\*, and > vendor/\*. > There is base/release/X.Y.0 in SVN. Is git going to have an > equivalence? > > TNX 73 30 Sasha In subversion world branches and tags share same namespace. But in git world they use different ones. And in FreeBSD src git repository, main, stable/* and releng/* belong to branches and release/*.*.* belongs to tags. % cd /usr/src % git tags show all tags of FreeBSD src git repository. And you'll find release/*.*.* are included in them. % git checkout check out specified tag. So if you want to get source tree of release/12.2.0, you should do as following. % cd /usr/src % git checkout release/12.2.0 --- Yasuhiro Kimura