From nobody Mon May 5 01:50:46 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrPcm1dw0z5tdnX for ; Mon, 05 May 2025 01:50:48 +0000 (UTC) (envelope-from kevans@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrPcm1CFDz3Gn0 for ; Mon, 05 May 2025 01:50:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746409848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3kCTV5wZKatFYq5EztU8qQUrGKvwqZEYOsxDV9rWWcQ=; b=s8kerlskBgfGmB6SNhM0StmGB6Kym6Ur3jMTv6mrrO2ndQ6C3oKb7tDkFtWfu2kZFjO8yE NFMQ8pW3RG8S0c5pZHn/d/4krmfehFYFcWk9qGrZX/4ql4ZmldZzOzL+cdd6xhAdFkOzSf gOdE6rWXLRTFVnLcDaiutckPhTGVY1GYqxjYqzR5iZ30M+rmKHRaZZ+xYsKCB1JbsrAt3v D0mz3bMwmNH6JdDNQe35V+i57d0aKOqnXLJaJlm0BVC6ZxpoQnA9xPmiCcfzK3u3JQT6RV m1PafzRTGtCe3xUkWZ7LOCGoGha0udx3spykil1kCLp+NdMCXIJlRWhvc3qN6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746409848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3kCTV5wZKatFYq5EztU8qQUrGKvwqZEYOsxDV9rWWcQ=; b=MAsoet8usQDY1j7TAq3AOoyozsyABYemnbvLY5ZV1veULtCzaKr/tfRn7v2CvyfuZLJ9fs +5rtydfhdrj3NMtYAqVnRhOWSaj6BWmv3kjWvHTiLvzpJC53wj8DF5DhNQnSVgs99Z+Paf 4nj0EWtT3AAdrtSAlCyMeJuPnZ3+RPHn7fItowAbUPIFb6xzFQFfV7mKscZKHf07MLhr0b Jq6gUhdKzY51+1ZMJfSMm7zTzzCBVepeZeWk/eu30zLQZJ7rrmcNMR6UIKsV2FMCrYd8VQ CzFbtuXcn5nMXOBtE5PFLVVvSXIe/0msB28gOZmKexVs42E4rMYLSfkjFR0TrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746409848; a=rsa-sha256; cv=none; b=SOzJz/w7a6TKpZ/LD4vaBQYHRxgmMrMLqpB2gS+nuqQLenMWEAWHN/StD1CmGLLTLlY30H 8ugLs3P5SQBO/bmaZOqG1irS4wzEIDjcx/n3swXLLfsgZ+73okUowAXC4baICXndrw+wdi 4rQS/1wxb83tybFUlFw9AmCltm6p3hIywoLaKhD1Ws98kUfV0K8/HwgrCttDEDFqRfM9Sg uVFzKn+TwLBpgwIU9tzNug7SJNTvKI95yXFTwHOE3Dqrx7kvh6COdAVGt9MzTXt9mFWxuh znw/tJ+9qxGiJRqwtTnJE2K4OZE2ZFbvy+C1tULgeWFRgmqTCk+Wf2XeHvsyzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (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 did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZrPcl6Xdlz120c for ; Mon, 05 May 2025 01:50:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> Date: Sun, 4 May 2025 20:50:46 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: freebsd-git@FreeBSD.org From: Kyle Evans Subject: got(1) in base consideration Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, I've been toying around with the idea of pulling got(1) into base, but hidden off into /usr/libexec and not supporting it for general usage. The idea would instead be to provide a script or two as a user-facing interface to do the bare minimum to functionally maintain a local copy of our git repos. However, I've run into some logistics issues that I wanted to throw out for some opinions. The main issue I've run into is that while got's repository layout is binary-compatible with git, it won't setup worktrees the same way. Additionally, it really doesn't like the traditional organization of a git clone, where you'd have your .git directory inside of your primary worktree (e.g., /usr/src and /usr/src/.git). I don't think this is really a deal-breaker, my proposal to start with would be that we clone the repositories off into /var/db/got/$repo or some such and setup the worktrees in the traditional place. git can `worktree add` from these repos successfully, so one could setup a git-compatible worktree at least without having to re-clone the entire repository, but that brings me to the second caveat noted in the paragraph above: the worktree format isn't compatible. We could write a script that'll bridge the gap, but AFAICT that means that we'd effectively have to just blow away the existing got worktree at /usr/src and recreate it, with sensible guardrails in place to try and avoid losing any uncommitted work. That's sort of ugly and I don't really know how to feel about it, thus this e-mail. Thoughts? Thanks, Kyle Evans From nobody Mon May 5 04:01:32 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZrSWv2h52z5tp06 for ; Mon, 05 May 2025 04:01:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-25.consmr.mail.gq1.yahoo.com (sonic312-25.consmr.mail.gq1.yahoo.com [98.137.69.206]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrSWt5JB7z3lQV for ; Mon, 05 May 2025 04:01:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1746417705; bh=JpKNA3sUkLgkxCN8Ft2RpLqnl0qsdmbZ9x2oqA/1i0U=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=nieLglL5uvx20X72DW9QWpo0LVTB49ubemaDZjS4bjFlf0jekPU8v25SNu6tlme5m5nQoo8YPtWf+HGg26ZjDWWCN/6RZxllGi46Iyg1ihzTdlDFUKD6GfxyZA6uXJ8OKpIXXL55hhEQN4FRqSV+Jt9jozBYXHCcJZbXw1etYIjMDGP1iMfMTdZI9i3vpV9r7EtPDTpZKIAt9d4LCfUNrLTaCVb4vGAJfCht7uA1qV6FtdMWTu6dLAk+yvN11+2XjYpmcSNoTgNJDgkz9em197MxMADy8z6yKw2Jc9Sg82MiMuCSZvPAjLSvBFM+DNSJj5hdHbXmdxJVTcbgGdUSZw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1746417705; bh=CHaCC8RSDcGtuC8fRj9CI/lGpqUgmbAX2bYyc1g0RZn=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=hopKw7DQXUdtU9AsoVph3xL9TMZ79swZ677yRWv+3GprCZR9QwdlxnUqBupFRO4kXLs5m2jiESSJPy7/lZpvcuHLk3rkNYCgVgstcQH5A5x/ZNiBylNSRDO94UAi+vmT5pcxMkdbHdgF9bApZdg/0TiVB/vWZqhDvuAz2nGQOMh/msq3MdQXdrMsFk+z249FSiNC2pAXHhKBM5Rhd9VNikU2c11Edb9oGyPkV42iN6/xNh+qL1G7TRSKkgGrfs/cD03DONDqIf2NmsHrGXrRWHlqjm4tLp3BhUWB+E8r+2QEruhZEvunCpAO9nB5ZeRgdlAoEci0Mt418r+oHTEZkg== X-YMail-OSG: Sf4.IZ8VM1nEP99rOvffbi.gOkjOQjJf.mT4BnojM_9Deqb1GTBhW1FhnIwDwc3 W61mcsmG9NmMXP_QBv0gAzNKjbeR4dUkekHPF.3geN5aGB_u67hpUEDRGjvQiIOhxSryqZGReefv VFQXASiMCIg_i_7b.lbBoncj4WmNYaEq6LvrHI4uHaYGdlZJyoTvTJRYpvDBNOSkcFzagqikq2zZ 1pCmeKcbiVpTMOzxv6umUyyqb4_nI.JQwtMMROx5zRbK_1H0HGZtBm1xWBqXvI64VMyqEZMv3mKU 2MErfl7tAJTEbJ7ZBv0dMtvDmbpIhNZn8MpuL5j8HC3RsdQ2PE_PUKK5zJTikNK3kBKjJmF__HLw Rz4b4ujO2O2yBpzsyUpZbVjMrnHPAmukdtHSQSo9u.JNBh18cPOyiRD1wBmLN6AocLWnf3mUMEOn lS8eYV.L7pRy5Y2IvIqXCsE1d6Y8_lpf9my1H_QbOHSe1vJ0GhmcVH8TYTvz5f1dj.PXHgsGCL3o vOTDmolFEZ8HcVLdia5y2nG0UbryNITs6bPdRLYkfAsUUXS8HmlShM4aaUG1j3oUxBF6o3J8imuJ 4KzrszgxFQoIRVUtqvniUHqddFNNbq3VzR8XBH32cN6Su2jP1urKKlWj2IkbdZ3OYDl4UYb1No8y k7OWtpGML_DHgRcyL2zcuat.C51TmPGWSoW0hX1U_59yI4UV_ujZ0SyQN2AOKhzBSn5hb7ZQWTwg .IvHusygMqfZHrrA2tieU8Sct4ZcFljeMKhlnRLtoQwRqXABSmOX2XE9C0wNMzMbqofZVRxmTGup CJF.Y4FCJi3p60oYS8a2DNHpcU6lvnaxyTWsPdZ.ZH9erQi6KHQijuCYQs56Vja4V3INBFUOK8p8 z2oYbJ.LtrWRBEoWJtaO8MZ7xXUaDnk2KH1r6eIZF8pV.KUjrcKkBY7Nt2k4kqSQbNRvlgguuj3h QemwlB3EPEGtqRfAJIZZXp8rX4kdvn9usH72w5msTSVdqIRrcoQSY7iGypYc4DG7WMrlwv2Dktyg qaOkzsw2Kw2R2Arc_qPnmqSKMwokUSeEZ0own4pFQovvsKVcAOfmJA5cAvuJf.l1_KQgHsMuSBCR t_nmgqFm2yKinyKohcBfSExOOF5rLXiiJBdAUATHWwwL5sYVISZLne7WJeGsKqjxJJlo5kixbiMi jTeJMIoOuRYszo0VyimVw11iMC5qQYBQUbBeOZtE3RLB3JXEpbXDXOPVSpfuOlbiNLcOpO4i5Z3B OZlOODCArVqTJShgP0opKoJ_Lmcoaj4nmpl9aQ6f.VkiVbc4yvljBIGuwoIguhifyeuaBtp_vD.5 SE4CuJ5UfhUOWCWHpX_w7R6oNX0QCMkwX.ZFNbXB4RUznBlXOHvuhY0wkj1V4h5o4JAALW0BjO8A W4B.m2ICDPK4uNvEY5LPBdjJU5okNP6fzkZo__npyPTNaTUeJkUAuyvG0OXvygz3wXBtgp9gRnha 2_QeiFHHH26xq.yqVXmSkgQCc.t7dqdmeavELQs321oIGZgrHyOry8AN.TO7.Y8QpFdd6hcFudBz XcQMCaia02mj5BH8DbLbVUQCMn81lx_VnBFMJBRJfCAUurc5HrRt_J7AaXezcKxjZlb9JL3Z3oVE vOgQT1Ji4I0Kmse0gIUuyfh33MC6VYoUdL5c1KfPhsKjyHIlfxolfoFDiaomDkNentvFqNl3Eiwf OcQ63mIn0GLEEXRopPObdOw0l.vnG2krGK.SpBTSj_YXPhSrzauYv1ga6YmujSfpQiWcB.PrYasy q.dkXI9nIJw7gipzIOURwFCoTF4TIxpi5tYExZeutHVS4.gWa9Avg1i5mBnX7Uds1CMx1Hi86ptX K3exYVENwY91ZZyL6muiN56eOi_6I6quF1rXHXsZ1fRtcZsvLwBogc4PHygS0nsoTohKcWomyuUF qCT8zeijG5GYOBzuGojHwcCuSt9Fd1J8XpEknUrRhdGd9pXaRmGIiCtoP3X5HyUM_WPwSiYkOF6L TvzzBHEUq9yLFd0eV6oIavRobKkKOXh7aTLcY4Q7V25FzIenF2DN65OUWJJ5dMSwkAUawdvEexEB g07kXTGSxINdAidMgjttEfClOh271PhZa.YHnipTkVbUriOZaGu9tjgbzRdgZU0mXk5kZm4jPRgh SBcVk0RJdLJnDevRVy3I3XOtsuJiVFEaUbIwytvvkjYKKXJXnXKx2KpgrsnJkj4nkvjBEyhPT1o1 FaLCpl6szNzDLLtJwplwC8B3cpctfQm8sasr3Tg0gDbeBzm2gvZlCt1iFH321PnhCAr_HEq1CINk 7bg-- X-Sonic-MF: X-Sonic-ID: 726718bf-ab45-4a94-bd9b-e6bb69bd3051 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Mon, 5 May 2025 04:01:45 +0000 Received: by hermes--production-gq1-74d64bb7d7-2dlqg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 462e25daf720d070c452d98a5b65d58d; Mon, 05 May 2025 04:01:42 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.500.181.1.5\)) Subject: Re: got(1) in base consideration From: Mark Millard In-Reply-To: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> Date: Sun, 4 May 2025 21:01:32 -0700 Cc: "freebsd-git@freebsd.org" , FreeBSD-pkgbase@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> To: Kyle Evans X-Mailer: Apple Mail (2.3826.500.181.1.5) X-Rspamd-Queue-Id: 4ZrSWt5JB7z3lQV X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Spamd-Bar: ---- On May 4, 2025, at 18:50, Kyle Evans wrote: > Hi, Hello. > I've been toying around with the idea of pulling got(1) into base, but = hidden off into /usr/libexec and not supporting it for general usage. = The idea would instead be to provide a script or two as a user-facing = interface to do the bare minimum to functionally maintain a local copy = of our git repos. >=20 > However, I've run into some logistics issues that I wanted to throw = out for some opinions. The main issue I've run into is that while got's = repository layout is binary-compatible with git, it won't setup = worktrees the same way. Additionally, it really doesn't like the = traditional organization of a git clone, where you'd have your .git = directory inside of your primary worktree (e.g., /usr/src and = /usr/src/.git). >=20 > I don't think this is really a deal-breaker, my proposal to start with = would be that we clone the repositories off into /var/db/got/$repo or = some such and setup the worktrees in the traditional place. git can = `worktree add` from these repos successfully, so one could setup a = git-compatible worktree at least without having to re-clone the entire = repository, but that brings me to the second caveat noted in the = paragraph above: the worktree format isn't compatible. >=20 > We could write a script that'll bridge the gap, but AFAICT that means = that we'd effectively have to just blow away the existing got worktree = at /usr/src and recreate it, with sensible guardrails in place to try = and avoid losing any uncommitted work. That's sort of ugly and I don't = really know how to feel about it, thus this e-mail. >=20 > Thoughts? I'll note that, as stands, a PkgBase FreeBSD-src-*.snap* and FreeBSD-src-sys-*.snap* together provide a source tree that does not contain a git repository. (It used to be true that the 2 could be from somewhat distinct check outs. I do not know about now.) No .git/ or .git (plain file) at all. PkgBase uses /usr/src/ and /usr/src/sys/ and I reserve those for the PkgBase files in order to best be able to identify what the installation is based on. In my context, official PkgBase kernels are present for booting and the booted world is a PkgBase one based on main [so: 15]. I've more than this, including places for chroot use and for poudriere-devel jail use. I also have my own kernel builds that I can boot instead. I also use git worktrees: /usr/official-src/.git/ ( the "main worktree", a normally unmodified = stable/* ) /usr/main-src/.git ( a "linked worktree" for main [so 15 as stands] = ) /usr/release-src/.git ( a "linked worktree", a normally unmodified = releng/*.* ) My activity for these is mostly in /usr/main-src/ instead of in /usr/official-src/ . I'm not sure what you are intending for contexts based on PkgBase. (Basically: ignoring my extra stuff.) =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Mon May 5 08:58:34 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zrb6d4MTZz5vB32 for ; Mon, 05 May 2025 08:58:49 +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 4Zrb6c4d8sz44px; Mon, 05 May 2025 08:58:48 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5458wYKo027038; Mon, 5 May 2025 11:58:37 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5458wYKo027038 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5458wY5t027037; Mon, 5 May 2025 11:58:34 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 5 May 2025 11:58:34 +0300 From: Konstantin Belousov To: Kyle Evans Cc: freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Message-ID: References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> 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=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Queue-Id: 4Zrb6c4d8sz44px X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Spamd-Bar: ---- On Sun, May 04, 2025 at 08:50:46PM -0500, Kyle Evans wrote: > Hi, > > I've been toying around with the idea of pulling got(1) into base, but > hidden off into /usr/libexec and not supporting it for general usage. The > idea would instead be to provide a script or two as a user-facing interface > to do the bare minimum to functionally maintain a local copy of our git > repos. > > However, I've run into some logistics issues that I wanted to throw out for > some opinions. The main issue I've run into is that while got's repository > layout is binary-compatible with git, it won't setup worktrees the same way. > Additionally, it really doesn't like the traditional organization of a git > clone, where you'd have your .git directory inside of your primary worktree > (e.g., /usr/src and /usr/src/.git). > > I don't think this is really a deal-breaker, my proposal to start with would > be that we clone the repositories off into /var/db/got/$repo or some such > and setup the worktrees in the traditional place. git can `worktree add` > from these repos successfully, so one could setup a git-compatible worktree > at least without having to re-clone the entire repository, but that brings > me to the second caveat noted in the paragraph above: the worktree format > isn't compatible. > > We could write a script that'll bridge the gap, but AFAICT that means that > we'd effectively have to just blow away the existing got worktree at > /usr/src and recreate it, with sensible guardrails in place to try and avoid > losing any uncommitted work. That's sort of ugly and I don't really know > how to feel about it, thus this e-mail. > > Thoughts? What is the intended audience of the setup? Who would not install normal git port but still want /usr/src populated? For what purpose? From nobody Mon May 5 11:46:07 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zrfqh4Kz6z5vNxp for ; Mon, 05 May 2025 11:46:08 +0000 (UTC) (envelope-from des@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrfqh3X27z44Gc; Mon, 05 May 2025 11:46:08 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746445568; 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=adlXrezshoeEsBbXQBVjbqhhT/rG2X2zCChhFTfbeoU=; b=AsAVR+Vj3uecZPSRSVxAAu1vyXJRK48LzRWyPHYIjFN+FOwFBCi0ugzq52pKdzCCaWjosh dd1RLW0iY+4yNaxxh3QH0OlG5e+70g0NtvKzLsxdMIbghE70+OfWIJtJSaZGlVIetAf+ho CPlkArCdbJO1V7twiGTpCJgYJ5lwCPSURFLehH9aOQtqUWvs96yA+hu00JBNRqgi30EJfG pSUmpG9BuNaCMxH0+1Okxema4GcbnYd2C4/xS4KQTAxtt4K8FEP76F3QbiUPmY4xi5V0Vb ib87Ldh7qemF03nv1j0qNcUSUNWq06w7kGRHXDByBfH6yHEjZLGuB5Je9TyM1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746445568; 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=adlXrezshoeEsBbXQBVjbqhhT/rG2X2zCChhFTfbeoU=; b=ehhMN6FTp1AVqKvwIFVi/yxJFwXtmLtrBF0lKSihl5Rvi0haqFbc2gDfB3b2/6PF89sq5i w1+hZt5tdxwgIAhi6DbmN6V+TFSR89nd4YzzMwJ+M8fFjVFWIEMex7pKhsP6dxPdjeTxJf O4JkbUTGv8sQd8aoO2x2cEXxwa0eXLaviCoCA3uVB9wchBnF+sL0h2bsZFo8Ai/KALGPfh bN2S15koH+nmrkzKvzIKzKnBp8VnII55VErfAxXQda+RHJTwv7NrLmO2+mg9E2oZXrA2t2 Orx24yxZZtpgBi4MtaHas6duvV0wIuASG81d0/nAIevdyyg/67mJFXrI131I/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746445568; a=rsa-sha256; cv=none; b=f31IZDEwvOSA+q6ZuqeEbNnsiUJuCOeCGQ4A7Hf5mUdliyZHRgHTZ9BQtqdAPOg4Vn5nXk sipH17jBPLWQQ8309Ti1TALGSwW2gHm/i1uk+TK+kE582hXgDM1fJwi/OSFKIm6L8XBFl3 QLSieQf1wJBG0fDGQdjLfgTZFh3rDPZpPMgFpmulvfxdVgJlC7N4+RMckMsiC6G9RSKS1J LRw0NexZEReDtR+Z182E0oSDInV4ChXL0hHc2V9IVRDaWUfSEg/xo5ijp5Hr52W+wjejEJ ZcQ6Q/oRT8wlVgb9yYsENIQxS2UhgXPp6fnZ30G8zqmC9dCtiv+imfm5Gl4uSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Zrfqh22P1z1YP; Mon, 05 May 2025 11:46:08 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 177B912FA52; Mon, 05 May 2025 13:46:07 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Kyle Evans Cc: freebsd-git@FreeBSD.org Subject: Re: got(1) in base consideration In-Reply-To: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> (Kyle Evans's message of "Sun, 4 May 2025 20:50:46 -0500") References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 05 May 2025 13:46:07 +0200 Message-ID: <8634djuvpc.fsf@ltc.des.dev> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Kyle Evans writes: > I've been toying around with the idea of pulling got(1) into base, > [...] while got's repository layout is binary-compatible with git, it > won't setup worktrees the same way. Additionally, it really doesn't > like the traditional organization of a git clone, where you'd have > your .git directory inside of your primary worktree (e.g., /usr/src > and /usr/src/.git). Is there a summary of the differences betweeen git and got somewhere? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue May 6 05:45:51 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zs6nb0y8yz5vWX0 for ; Tue, 06 May 2025 05:45:55 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zs6nZ0J0Sz3RdQ for ; Tue, 06 May 2025 05:45:54 +0000 (UTC) (envelope-from unitrunker@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=cHwzfVuN; spf=pass (mx1.freebsd.org: domain of unitrunker@gmail.com designates 2607:f8b0:4864:20::329 as permitted sender) smtp.mailfrom=unitrunker@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-72b82c8230aso1466251a34.2 for ; Mon, 05 May 2025 22:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746510353; x=1747115153; darn=freebsd.org; h=in-reply-to:from:content-language:references:to:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=5zhg4NXxGI8w6cD3ti9HuIo0po1PDgEFjtTESCbWvNc=; b=cHwzfVuNeZHqnnvYSLKrXIUeqH6vwhzMjHF4fRWBjGDbuhNj+S1Mt8s4nqE0gXLrtS /EZHDHqCJdgQIRUpN0eTExll5F1vN566OJxx4XtW3ujp/cmlSlCBq6eiAXaIfjP/8lir Xui9MJx2UohOA5+62uFJRtBL+wm4ncGIxohF8xruKEOVGg4v5LrPbmJRSK8MD4365pVP P/GHjH557MIqGGGnMXPXNoENYpH4POtjSS85FKAwKyd7EKcVCNDVKz8cyAXFc3ODcKHL C8mnUf9nVtwT/PrrF6Jcwh3wvynpWDiW39iQGoufR8pPWDbHyQyMag5ryJcOeTgldqj7 mxZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746510353; x=1747115153; h=in-reply-to:from:content-language:references:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=5zhg4NXxGI8w6cD3ti9HuIo0po1PDgEFjtTESCbWvNc=; b=ZBtxXWU/PpynV8xF6sZs5T6V6lbbj2H2twV2/PuvCe9b4A9xY2Ytz1cRPFd5hWI7Hf 8cTS9czr7oxA4fFOsjdVGhmm62IIaShZcPUrSv9pQQRHfK5Ussxas05io8gf3uc9ahaT tIVVXq7Wc/JAh2iphEXPUmqHC/cD2pRGDxbh/e/rT/JYtk6J7+3QwfiYx5NDJrrMWYWa pkp5iNTRXR1Nh/iOtXIQDNiMBLdjVR4O3YkjsrSgBj37rVt4PfegndY6AMvuQ8xQ97wC wDkYqHCKemH4bvw76WzCY7CBV3haynWKlRpee8hCRv5Y/HYScmkp/8VMUR8EiSadP77q 9DFw== X-Gm-Message-State: AOJu0Yzv8BSFJdlr6ZJdIr/583cCZujX+YYj/vDjczV0Jwt+/+s4TuJo tMACwD9DquAwzpFtZkN578KFjR9vZ7c+NQYn9xZ8NlbPfv/DsVOH5D1QQw== X-Gm-Gg: ASbGncvBvv50roF6+HgYKBR+7TkfeYwnW21NWUsWUk9NQQkoU1by/5349xGdywk36Ho BPTTyIDq/iO3hsU6kgq1prIKOKpnw4KhoOH18EHP8why2BP/wOTS0SSs2jRxbyxHroUYttfrbtY GCE+oC50dTW3uynWpkEn7Jlz8s7KdhhhmnpoaqkPm1IhGYqc62j0pQP2y6MoK5swSKu16Hi/xRo XLa0b5Bxoimt9puJ59+uTBs4ItkBHnOlRo0H2ajAm0/SO7a2TsvCs1fkKw5C+fGax77nQWxweNv xhe9IwKILrvvtGXisp9pcAHyULcAsr8DcarVcLw2zSqBdsGRmP4zWy+6/f/HSYWdmsWK10FWmJ8 e5BxttqKF1fN4JT5JbavLYgs= X-Google-Smtp-Source: AGHT+IH00qe06tpI5AK7VuGbmVjsn5vq+KFpzmYjte+FiVcQYloV2YXymYUPnof8BTXpYSdChW48eA== X-Received: by 2002:a05:6830:3687:b0:72a:1dfc:c981 with SMTP id 46e09a7af769-73206ea3dafmr1205371a34.25.1746510352631; Mon, 05 May 2025 22:45:52 -0700 (PDT) Received: from [192.168.2.22] (syn-072-182-033-235.res.spectrum.com. [72.182.33.235]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-731d31c71aasm1882207a34.20.2025.05.05.22.45.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 May 2025 22:45:52 -0700 (PDT) Content-Type: multipart/alternative; boundary="------------VM3mICju07aD89wI6YjKVQpZ" Message-ID: Date: Tue, 6 May 2025 00:45:51 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: got(1) in base consideration To: freebsd-git@freebsd.org References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <8634djuvpc.fsf@ltc.des.dev> Content-Language: en-US From: Unit Runker In-Reply-To: <8634djuvpc.fsf@ltc.des.dev> X-Rspamd-Queue-Id: 4Zs6nZ0J0Sz3RdQ X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; NEURAL_HAM_LONG(-0.93)[-0.929]; NEURAL_HAM_SHORT(-0.65)[-0.651]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FREEMAIL_FROM(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::329:from] This is a multi-part message in MIME format. --------------VM3mICju07aD89wI6YjKVQpZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 5/5/2025 6:46 AM, Dag-Erling Smørgrav wrote: > Is there a summary of the differences betweeen git and got somewhere? > > DES The game-of-trees website might answer that. I suspect list of features changes over time. Game of Trees --------------VM3mICju07aD89wI6YjKVQpZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 5/5/2025 6:46 AM, Dag-Erling Smørgrav wrote: 
Is there a summary of the differences betweeen git and got somewhere?

DES

The game-of-trees website might answer that. I suspect list of features changes over time.

Game of Trees

--------------VM3mICju07aD89wI6YjKVQpZ-- From nobody Tue May 6 08:36:01 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsBZ162nDz5vj84 for ; Tue, 06 May 2025 08:36:09 +0000 (UTC) (envelope-from olce@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsBZ15VjQz3p9j; Tue, 06 May 2025 08:36:09 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746520569; 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: in-reply-to:in-reply-to:references:references; bh=zddMI0cXipLwZb19xxPDbhnphtnRLKSP1cno4ZmY5zI=; b=nmsDGiyzDzaNzwKA0XyxzYN44fqH7Kpf8AuEagTh2vxMwKfv+XcGr/zff+hjednaDUF0/r zQrXauGGL30Qsc9yiU3h5VrppmVlBUWmEnL4pb35sWYw9CAoPARinkytn4CJAe/YZbsm/8 mQK5HwO4PenhKZjtiN3DySQkA8lvaqh4A517qMzk6OA3CwDeNFH11jp3Dr/WaTQfyCIncB piJdeHukl+vvyUkzHnJkyvQ5ufE1x/1aUnGZHmyQdNESBXWjNR2ih372Wizi/aTP6scWtK VtM8VVk3oQEWuVUyX8CAmyhmOzkbngpIYCGIkwN5XuKj1olZxkpFq840ypnxSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746520569; 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: in-reply-to:in-reply-to:references:references; bh=zddMI0cXipLwZb19xxPDbhnphtnRLKSP1cno4ZmY5zI=; b=Bw1XC/+dFq6Jf9ATZq08C2/MmnmiDaU6H/bPiQQqypfQovjsPT4HZ+pjlsLB+Gy1L4z4sv /nL0QU8nx2qMyF9bCtiYZd/lxCK1orV6DtEe1MyOGJ9BWFIOFDg0CYFcWFCa0IgbnznPf1 jsO0ORQ6bCyQ+oNHxx1RcwXmbbhVH81T4uHvejh/OLWdm3sh/r2XK9ilf1j/WFtwFbWwRV CNbM/wjngK+lz2fLiIRWnD2FQS/GVcY+UD5LVIDoYPlP9HnoF9/vhuFCJwYD//sTPCprt5 24YOSFrt8gf52QqRw6nbflIzw/DajSNIrN8UjeuKOGMJo720heH7Ju4XOAm46A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746520569; a=rsa-sha256; cv=none; b=dY/ohOU5V09VXhBRPmemVANeLwn9q2pJGn/fdalSamT9Zp1Xl3ItJX68cnAHKxDADJVs9e sZkAWTJYP2Dza2Mi7Zkqo9BDTYZ+kiH0hNRf0z+DA2aeFM92xaVNCWQxWllexVc1NOIXUY 3wa+3Ix7YfGqkCWMRvxkRGc/5gYEdW90m9bFO96x++/06BPZli9+aNZN1AR1hMycStE1G5 1I9hvbMR2nUYUK+g8mk6ROExjE//ojKbXXdIvbiUXNOcaH8/AfIFsjl6EtQqtzbaPJAGmy zjqdMu3YT7YjJY+WAg7IK1YHl982TyHmnmfmWRigZcCHd5LltgbOUixtfzqOrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZsBZ11PZTzYyV; Tue, 06 May 2025 08:36:08 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Kyle Evans Cc: freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Date: Tue, 06 May 2025 10:36:01 +0200 Message-ID: <2029663.vslOlgHxSZ@ravel> In-Reply-To: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6097320.Zv9zXsTiuT"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart6097320.Zv9zXsTiuT Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Olivier Certner To: Kyle Evans Cc: freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Date: Tue, 06 May 2025 10:36:01 +0200 Message-ID: <2029663.vslOlgHxSZ@ravel> In-Reply-To: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> MIME-Version: 1.0 Hi Kyle, > I've been toying around with the idea of pulling got(1) into base (...) > not supporting it for general usage. > The idea would instead be (...) to do the bare minimum to functionally maintain a local copy > of our git repos. I think that can have value for server/small installs where the source is still needed (package building, local tweaks, etc.). > (rest) I've never used 'got' so far, but is it impossible to just checkout the bare repository without creating any worktrees? That could be a useful "option" for people that know they will install and use 'git' afterwards, and solves the problem of trying to avoid losing uncommitted work by just making it disappear. I guess that detecting uncommitted work with 'got' is as easy as with 'git'? I personally would not be shocked if the script flat out refuses to proceed on uncommitted work, and see trying to automatically detect, backup and reinstall this work as some nice-to-have that can be receded into the indefinite future. Thanks and regards. -- Olivier Certner --nextPart6097320.Zv9zXsTiuT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmgZyfIACgkQjKEwQJce Jie1RQ//c4QYL1S0d6TGnKUsO2eGZd2G5kB4S5UhyNi5BFlVHJQwnfhKHcdQJecB tg2Vxt5I+R5SasDQtZppDS8p+9V31Hb0eCU5GSXMyCdHG2ljZqKCMjE+cdC70mhY HBVcjsKLiZD7DtxPVYL3GS3NTutZ4G74yrDAZYjEYmHjgg4ICNAy2l1gRHv1CFnh tk7mQjYyHTyL1AQ85Se05S78+RDCNUDYfH/FYhYhFgU9+Jl5miC+A80y9vJ7Klmy huU4vHXbKnF1F47jFMPsE8JEYsv47mYhDdfD5sjWlySg6yKygGVFt9Afp1a4MlTH 7eE8J5xENu9cfvBnwQHj393+nRdK1uaNgYoU3ojAihq4swq9u17AsGve2gq4s5yV AkGnq3iz6Rst6OdeHULHQDSHaUX/5JgseAseNLFuo4FBvqTafTR2t3vciXBrVdsp qLdW4cpelSauOW4ERPz5G/gd4sncvl7fLT5Tk1pQdX/mc38+fHw7tWS5v4NbSkzw Yl6QlFyg580oUqsWRqHESyLMVpjYxCcMcDicdUmWqkZh/uPZskkEHsJHWVZySvA7 lHcrJVhOUFXaOjt0wl1p66Z2OUMcPEH/dfH+iNeW1UKmJMYj0KJdsHRqoITR84yZ Qt7JcsKDk/8exdf+lTEIj3HRvH5Bt79G9wFYjqN/aPHsxGAt+oY= =sToT -----END PGP SIGNATURE----- --nextPart6097320.Zv9zXsTiuT-- From nobody Tue May 6 11:05:22 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsFtb2sKDz5tdlN for ; Tue, 06 May 2025 11:05:43 +0000 (UTC) (envelope-from dch@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsFtb0bxPz3nVF; Tue, 06 May 2025 11:05:43 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529543; 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=E6NRTj7AiVD8FHZXb7lu3ps/rNu5btX0aLhRGRq8cq0=; b=sO/Cip753Cgt96XOWylMd0DhMGnWjC7qObv1b+IM64sJ1ATtMJQzoRMtV9f85SH5ZMNc5e nXdUEgtTzYVbnqVrmWf2OJf/jDv8rGMWknp4LBvGH8eIwkhW7t2kLSXO1kjFkpV+VkXlcJ ZI8HtQ2QIuMKj23wPpMSWEd9mLWRtMpNGa2kMoH0o0MpbiREJSbTbHDy838UwUNyBknMWk q4nqewQAxIhssIvxYafy0mZNyDHzzP4Ajoi4Y/QbNS5b/hNhQN51dvaN2I/QHunf7x5Ng8 uY2wAxpTJV8FW3Bni/n6gbu4iNwIFQNNhQQac9oUdahQX7IL9atGwk8koPajiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746529543; 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=E6NRTj7AiVD8FHZXb7lu3ps/rNu5btX0aLhRGRq8cq0=; b=D45saFBq58qb8sVDNKq8zyLG1NaUh2uOgNCnnf1uQOlrmNa7mk035TMdfo7VJcF9UaiH0n pZeZLoDonqMuaY6r+g+I60ksrTABiHww5CMacmRkcX/BHCdM6y6tVwUqaMGU1SVSoXaf3S wtfiu43l6Y6qY8kaJXK6uh0HEpotozye4rvByvH3amn9L3uURk0q0eOhUGpe/AvcOakbst Vxav1iJA20SXDNB/br3IDgTx71vWq+vsv3h/m/ZB39Ct+LqH4selb4LGRtCaJqpxLpGU4w nqXgI9KERIkf7A8JhQz6GgsRZDRQa3u7rTd0JUnL1V98xOn6RpZ0+RhSmkI/OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746529543; a=rsa-sha256; cv=none; b=eeWWP7OuGi5MCABAZNt/LazxCs1jnrGg9Coj7Haf263fDFQOWMbry1Kw04Rbte49nrI6mq dFWXGFpmLc+9n7J/djrmWT3PLFUVTKHpQMzjBwEUgY6PGZ2xZ/nDgDu6eDgoJyrAZGMZRS xWuok/OKjyyWg4gEiyu1Mj0RRzV1B95Tcx1O71Ay+Nyzs8hiiAmJL1OvzIIoEJv+MgjP5T Qn2VhFmJCpNxt+Jmm/OTqpmJ7KBntIpLERrGGqOsvofNXhsnZESGYFDf4TXlFBdKNXtIQd 1PJ5SjVxX/mxLzn0a/SNoM7RpgX+k4gdZBIFpsJBi/ukUZH7SESrI5eeD4Ss5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from fauth-a2-smtp.messagingengine.com (fauth-a2-smtp.messagingengine.com [103.168.172.201]) (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) (Authenticated sender: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZsFtZ6hDczmjX; Tue, 06 May 2025 11:05:42 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfauth.phl.internal (Postfix) with ESMTP id 6BDC21200043; Tue, 6 May 2025 07:05:42 -0400 (EDT) Received: from phl-imap-16 ([10.202.2.88]) by phl-compute-02.internal (MEProxy); Tue, 06 May 2025 07:05:42 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeefkeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhepofggfffhvfevkfgjfhfutgfgsehtjeertder tddtnecuhfhrohhmpedfffgrvhgvucevohhtthhlvghhuhgsvghrfdcuoegutghhsefhrh gvvgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpeffudekleekkeeuleduleettedv geffjeduleegudfgtdelheetleegvedtfedvheenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegutghhodhmvghsmhhtphgruhhthhhpvghrshho nhgrlhhithihqdduvdegledutdefgeduqdduvddufeduudejjedquggthheppefhrhgvvg euufffrdhorhhgsehfrghsthhmrghilhdrfhhmpdhnsggprhgtphhtthhopeegpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopegtphgvrhgtihhvrgesfhhrvggvsghsugdroh hrghdprhgtphhtthhopehfrhgvvggsshguqdhgihhtsehfrhgvvggsshgurdhorhhgpdhr tghpthhtohepkhgvvhgrnhhssehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepkhhosh htihhksggvlhesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 48DF52CC0075; Tue, 6 May 2025 07:05:42 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 X-ThreadId: T79ac2f494f23bb88 Date: Tue, 06 May 2025 11:05:22 +0000 From: "Dave Cottlehuber" To: "Konstantin Belousov" , "Kyle Evans" Cc: freebsd-git@freebsd.org, "Colin Percival" Message-Id: <161bb38e-19e1-48cf-a75a-9a7365a6b841@app.fastmail.com> In-Reply-To: References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> Subject: Re: got(1) in base consideration Content-Type: text/plain Content-Transfer-Encoding: 7bit On Mon, 5 May 2025, at 08:58, Konstantin Belousov wrote: > On Sun, May 04, 2025 at 08:50:46PM -0500, Kyle Evans wrote: >> Hi, >> >> I've been toying around with the idea of pulling got(1) into base, but >> hidden off into /usr/libexec and not supporting it for general usage. The >> > > What is the intended audience of the setup? > Who would not install normal git port but still want /usr/src populated? > For what purpose? thanks Kyle Konstantin this sounds very interesting from a releng perspective. >From a security perspective today, building freebsd from trusted sources using a git clone (as we do in official releng builds) requires building git itself, which means we pull in a very large set of dependencies from well outside the FreeBSD project, including python, perl, curl, cmake -- 49 dependencies in all, assuming git-tiny flavour is sufficient. In comparison, got (as built today from ports) requires only: got libretls pkgconf (and pkg ofc) This is a much more reasonable subset. Assuming there's nothing surprising in how we use git in releng, having just enough `got` tooling in FreeBSD source makes our trusted build provenance simpler for somebody to verify. It shouldn't stop anybody from using git directly to build from sources. There are only a few git-related calls in release.sh I will have a crack at building with `got` only. A+ Dave From nobody Tue May 6 14:41:21 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsLgR33kGz5tvKf for ; Tue, 06 May 2025 14:41:23 +0000 (UTC) (envelope-from kevans@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsLgR2fVtz3Pqp; Tue, 06 May 2025 14:41:23 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746542483; 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=TFjCjATquyBM5G1sLC5PLO4Q3cZlB3ssqC6eHui+9J0=; b=UHUj/t5DBtKqXvO+2JRhI7Mfx6jV3kjQaQZD2nbB2VR4QbBr5FEEU7qX1TkwoNFbkPfMjD UBQZG/fPavi+eoPY5Kg5EdRnOBy3ZulLJAAEjsZBxmJddwavkN39i6X35huNCcBNF9Vnsh ARhYyCXZO0rZ+pMeteTDo/UsICxTKnJdCb+4VkpHeDvDsnvvCwx6GxKvEcTdOJTjvgWfAv 1lqC5IznZ958w0+zv36hQ/e0yH5AV5lyfs+IhaCCqM2VyioPUmYUeQ+Fu64e7SZErgTV+A upEdOz71rioynStbGsNWRsUc8gnj0CsJSPfefbDW61z2OKiTI00H+xULUjLpVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746542483; 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=TFjCjATquyBM5G1sLC5PLO4Q3cZlB3ssqC6eHui+9J0=; b=vDYf2lWU8Th4x3532I0bjc4OZywQAslDzxbWDRH1HNGCSg5sSVujXYum+PFepicrOxDlGm pOFGo5gmsFVFw42K3tvtinXWPXgQtRIHCJy38NdoudfPRY1H5jn+bSXb+jSLsMDTpeolGs d3zwD6NBza6z+Zgx8F979oUwcSPu9KKiJF8Nngi3x0Gbub76xs6tmXMiaU7ypX65HFR2Ir 9D5yUU6+0W7p+oLM4sKe1Bu2JA2IguC5ySJ79w5YC/Dn0G8rXAjBDpuXF8AXhZH6cpGt5e 4iaf9deGkyKw2LCMz36efUu52TqSAZSPPZHdvKYCFh8Qo7HqCragSUKIweF6Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746542483; a=rsa-sha256; cv=none; b=fW5wHneicsxxelicZ0E75aUaWupBGssUTjQNlL/ZPgmp29pMhEpwXy2w1MUQqDbK8Li2II IbV793cA0S18B0SvN6/kGjrZkeDhOnFju/W1Ho0uS8j7XgiA4+aV1SLDnb74tpcTrGVvul NgJU2wvgVWlHNG4zIM27YxtbUjFmUCLVmFA2TQT+sKM68k8l18QKzZwnXQkjJPVWuv7QPg V8V64IFCIeLzY/ptyCJr4MIPK0SvgAMJrMqp0beSojI5Crpjlj+eGmZZaCAEYq6jIA0+z4 l3j7WHppyeca9NvjpWDcblVsKKu+zmXA+RGwYvicBbL0pfO6HrUgEfni9Sk3GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (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 did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZsLgR0hLZzqpC; Tue, 06 May 2025 14:41:23 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <7f04bd7a-9959-4b45-97af-008a8c58e21a@FreeBSD.org> Date: Tue, 6 May 2025 09:41:21 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: got(1) in base consideration To: Konstantin Belousov Cc: freebsd-git@freebsd.org References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/5/25 03:58, Konstantin Belousov wrote: > On Sun, May 04, 2025 at 08:50:46PM -0500, Kyle Evans wrote: >> Hi, >> >> I've been toying around with the idea of pulling got(1) into base, but >> hidden off into /usr/libexec and not supporting it for general usage. The >> idea would instead be to provide a script or two as a user-facing interface >> to do the bare minimum to functionally maintain a local copy of our git >> repos. >> >> However, I've run into some logistics issues that I wanted to throw out for >> some opinions. The main issue I've run into is that while got's repository >> layout is binary-compatible with git, it won't setup worktrees the same way. >> Additionally, it really doesn't like the traditional organization of a git >> clone, where you'd have your .git directory inside of your primary worktree >> (e.g., /usr/src and /usr/src/.git). >> >> I don't think this is really a deal-breaker, my proposal to start with would >> be that we clone the repositories off into /var/db/got/$repo or some such >> and setup the worktrees in the traditional place. git can `worktree add` >> from these repos successfully, so one could setup a git-compatible worktree >> at least without having to re-clone the entire repository, but that brings >> me to the second caveat noted in the paragraph above: the worktree format >> isn't compatible. >> >> We could write a script that'll bridge the gap, but AFAICT that means that >> we'd effectively have to just blow away the existing got worktree at >> /usr/src and recreate it, with sensible guardrails in place to try and avoid >> losing any uncommitted work. That's sort of ugly and I don't really know >> how to feel about it, thus this e-mail. >> >> Thoughts? > > What is the intended audience of the setup? > Who would not install normal git port but still want /usr/src populated? > For what purpose? Hi, I'm thinking less about src here and more about ports, where end-user/sysadmin may just want a simple mechanism to keep their ports tree updated (as a replacement for, e.g., portsnap). Thanks, Kyle Evns From nobody Tue May 6 22:27:09 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsY0w0ZTHz5vXt1 for ; Tue, 06 May 2025 22:27:12 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: from mail-oo1-xc36.google.com (mail-oo1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsY0v2BjHz3qbP for ; Tue, 06 May 2025 22:27:11 +0000 (UTC) (envelope-from unitrunker@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=nNMtO85e; spf=pass (mx1.freebsd.org: domain of unitrunker@gmail.com designates 2607:f8b0:4864:20::c36 as permitted sender) smtp.mailfrom=unitrunker@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-6049acb776bso2865108eaf.3 for ; Tue, 06 May 2025 15:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746570430; x=1747175230; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=DJBt9cK3oJwAUHPoRdUR6522WWvhGcsOYj6+bCLLnFA=; b=nNMtO85ep8eefXK2/4sUovEZhQquq0mT4eATmtMSYmYbBU8lJ+MHbXvYIdtzr9CBO4 +UwRx2DfI3LEdEnSgoYywy087qO0x368UMk8Jw7H9i/ErS8SoDUFV381lZAh1bHu1orG jHgXYkGiOqM/LshjYLQGXJGZrwqU74h67ZlEJxolv91MCuylEHgBXpRoWbm0NqyqdrBw Sc2oGskLHuArq5A8eW/IhGaPeNrphghLFVmgVvJ9C3ekyS2NcLHERW0ft7bb1mqSHtTY hTNTmBe1cxjMbIIPvvZtavAeS0KnIQxL+AFklxgWiz25w2AAgDAE05JSghc0HY7ASQOf 5faQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746570430; x=1747175230; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DJBt9cK3oJwAUHPoRdUR6522WWvhGcsOYj6+bCLLnFA=; b=kKvxMFZIlkZ8hlwse5dN43wV9ARYNsm4LsK7/yaYzKkOz2OzID7mRTB0MsSoeFM3ky zevGZPO/0CEiSmOz+emZSb9hUahTkoXRK0xUBeivGkfFFzwNvryyWRBM/deNJv+E7yJ3 aR9KzgSrV8je9q1EupCv16j9MrDcPMHs+xL4IjjcNXXBqomHcQHSkEY2RPbbF5KfzBih Qz5I2o4V7ei6wBHwNpr4p7+1bRoNUyfXHh2wAGbxgeKlytl+mETsuL/BqfL4VZ7XTC3S iH7s3H3HxpdD1SPaOmp4iIEkborW9Bge2JKW9iOyiUbj43H9wDvLZTmoigcrF3S8EmWs UbIw== X-Gm-Message-State: AOJu0YzDlMivSKRvH+QeYQ5ojIDniS+2l8Owsa+o0BmOQeKeZlszitU5 q/+v8awnBZwSmA4yxrMjHzOdlJi3V4N4lMtflJwvvaPR1weY3FKeKXd+6skC X-Gm-Gg: ASbGncvvK5yCwjMPOsE9VoGGL5hxVQotJ1NlILwiOgjE7LfvQVX4RHunLMXxtCL5t0/ N19ZaBFl+7XxPeqO3AsYNyAm7MWUUCdNwoWqLOBtQQPWXF5Ah4Y0NGSzjqShlUMOmEokSLBqakU Fj46Qo9hYOLOfWu7NL/UbN14KYHAXulRVByrw8ZzBZAiX/GfdbPVR+y0Na0/etish8yyrSlWw4p QY/0My+MYBMa6cAFQ6XwohcTLwBHXPHlsMUjrcKBE/G8sqN+uSXyBlV76LFCDiPf/M2gCUxrhhe FWzcIOiKs6tm+sYioVh0Ww3PF9vyVCV91X9tLEgpycSWNv8Ao0jHL7ttHpXDwP5t6A5eml+ipEl m7GoweAO4X3A= X-Google-Smtp-Source: AGHT+IGMODFKMs9NA3zlUe/KAtEGogO22RsXnuuavpOmt/kmhjNlDd1LUq8EkdzQn73J+s9pgtaJ4g== X-Received: by 2002:a05:6820:1809:b0:603:f2f6:fd41 with SMTP id 006d021491bc7-60828d24ce3mr923231eaf.3.1746570430240; Tue, 06 May 2025 15:27:10 -0700 (PDT) Received: from [10.99.168.192] (m20677150111.austincc.edu. [206.77.150.111]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-607e7fe8e8dsm2481701eaf.38.2025.05.06.15.27.09 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 May 2025 15:27:09 -0700 (PDT) Message-ID: Date: Tue, 6 May 2025 17:27:09 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: got(1) in base consideration To: freebsd-git@freebsd.org References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <161bb38e-19e1-48cf-a75a-9a7365a6b841@app.fastmail.com> Content-Language: en-US From: Unit Runker In-Reply-To: <161bb38e-19e1-48cf-a75a-9a7365a6b841@app.fastmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4ZsY0v2BjHz3qbP X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.82 / 15.00]; NEURAL_HAM_SHORT(-0.99)[-0.993]; NEURAL_HAM_MEDIUM(-0.88)[-0.882]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_LONG(0.06)[0.058]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCPT_COUNT_ONE(0.00)[1]; FREEMAIL_FROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::c36:from] On 5/6/2025 6:05 AM, Dave Cottlehuber wrote: > In comparison, got (as built today from ports) requires only: > > got > libretls > pkgconf > (and pkg ofc) > > This is a much more reasonable subset. This ^ Thanks Dave. From nobody Wed May 7 00:36:56 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zsbtf6gj7z5vhm1 for ; Wed, 07 May 2025 00:36:58 +0000 (UTC) (envelope-from vishwin@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zsbtf5s99z3Fxq; Wed, 07 May 2025 00:36:58 +0000 (UTC) (envelope-from vishwin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746578218; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=HGF9ZEjEDqAKaIjN90cuYV7oR2fEVGJcg2gyZ3zv5nA=; b=MwEKhiKsQzt8LNdBRC1ub7hGf84LkWJKr2yosk8Eq/XINrP9RG0RgzK2NW6CG7pjYUsUKi xbRjIWAjCqZbnoQ2LMi3/OvFG1++hxjB+Bd/mfGbbmEbkDIcNxUbZY079WIZsiZyyq0h2D 4CkgpXm7kc9bJNn/v65sIdNFYHdyah5ABcfkSSOvGknLxq/Xqt/kMilyy/zIvldEeTh7vW cMjoai2FjQf4QnKK9kiXUZZkeOedhbE0fho205gX58NGSLCYwexTXynJ9wylx+keYFjzcd QoDmazzT65M6gtsVxnM+/Zbo1H+/PVxkag9NS9qtK8EI2nRFDNgLDN8643OMPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746578218; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=HGF9ZEjEDqAKaIjN90cuYV7oR2fEVGJcg2gyZ3zv5nA=; b=uLStR0nQyMtrpOA3IUceUjYWsNTJeA8Q6qnNBC2nwm0WH5AAHR5gW7A/b6HBFy9B+KVI9d z9BLCdHvoNzFvNYICnb8r34XUpjYsajgBMGiOFOtM0c0sq4tuqwKvILFPWkVIO6s8j0gYn omduB6nWVQMJQkrNoP/0nt1cMaQC46Y+tuXoaKpPWit2J+4H+RX+sHHdbXKZkyzjIvWEmI bg8o/QcVorY13tnp8/YS6UksCWJS7imt9Y8LjFaUc4tRuyT2XQEg3VtJ4nStuYihPjY3kv ctmRW0ukMqPn+HfZOPzYxMlEvGycVFzjsccpptLkpq2tGYns2jwoVy/TcJZztQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746578218; a=rsa-sha256; cv=none; b=o+df2VbNW8cPW/8gYpB7cgN26EBK49s2PBI8a7r8yaM8J6kEC4J3NPfIbw4Pqm03A/dOP8 gcEedzyh3Ty8dJ6XvTw6pjZNKUjvgSNDUXII39+OIU/8lJQFr3XcO9SdCouSdX7M1SxPaN CZtEmS1NimPV3lchYVoYSpu2m84pkhA1E/vWT4SGteB7fKvzXdCBCGIeK/Zoq8WCgOJuXo jXrOUoj8BPU+6CSbO9FrM3rWKNCKHT0xqnFCbKs1pgZdq9tL24B9pSRw3Hgijw32jXmVsz oTEI8yaX92cAxQKqJ9r3F6MW7r/0Luoax4vr+E3lYcXrGNmgMdv165A/VvAANg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:98a:d00:c180:56ee:75ff:fe50:69b5] (unknown [IPv6:2601:98a:d00:c180:56ee:75ff:fe50:69b5]) (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 did not present a certificate) (Authenticated sender: vishwin/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Zsbtf3xP4z14Pq; Wed, 07 May 2025 00:36:58 +0000 (UTC) (envelope-from vishwin@freebsd.org) Message-ID: <672c6ffc-e703-446e-8b40-311ee9ea5c09@freebsd.org> Date: Tue, 6 May 2025 20:36:56 -0400 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: got(1) in base consideration To: Kyle Evans , Konstantin Belousov Cc: freebsd-git@freebsd.org References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <7f04bd7a-9959-4b45-97af-008a8c58e21a@FreeBSD.org> Content-Language: en-GB From: Charlie Li Autocrypt: addr=vishwin@freebsd.org; keydata= xjMEZFWWqBYJKwYBBAHaRw8BAQdAINFDmM+bgGkT1C4nD5a3BxgcH8Xnx5qTJbPuIBxD57LN MkNoYXJsaWUgTGkgKEZyZWVCU0QgUHJvamVjdCkgPHZpc2h3aW5ARnJlZUJTRC5vcmc+wpkE ExYKAEEWIQRTQA7vBfo8y1zE1rpnj5NgWEFcygUCZFWWqAIbAwUJA+3ogAULCQgHAgIiAgYV CgkICwIEFgIDAQIeBwIXgAAKCRBnj5NgWEFcyllaAP9CGICFEvTUOv5BYh/H8m49VJ87a/wd 0obeQfVBnS464AD9FopTHbjEs0HDV0ZYmJPxzJIznjumsj9gBxX0bBqqTgzOOARkVZaoEgor BgEEAZdVAQUBAQdA6BUWuG5RuT0vmtoDyCUUqiJGdtd78GM5ic3kw2AntSADAQgHwn4EGBYK ACYWIQRTQA7vBfo8y1zE1rpnj5NgWEFcygUCZFWWqAIbDAUJA+3ogAAKCRBnj5NgWEFcyn55 AP9ezKDCUgHqAq6JX976abb9pYdbSjxxNJqnrjgNkfhgIQD/QhR+fgnUHhcGTMBy+pYHZUGH 5DCuITsK1U4+v252uws= Organization: FreeBSD Project In-Reply-To: <7f04bd7a-9959-4b45-97af-008a8c58e21a@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------wQ4frTofBXnKczAdSBCiRPRU" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------wQ4frTofBXnKczAdSBCiRPRU Content-Type: multipart/mixed; boundary="------------ap96Hgd2pIdWiS5xKKXUe18P"; protected-headers="v1" From: Charlie Li To: Kyle Evans , Konstantin Belousov Cc: freebsd-git@freebsd.org Message-ID: <672c6ffc-e703-446e-8b40-311ee9ea5c09@freebsd.org> Subject: Re: got(1) in base consideration References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <7f04bd7a-9959-4b45-97af-008a8c58e21a@FreeBSD.org> In-Reply-To: <7f04bd7a-9959-4b45-97af-008a8c58e21a@FreeBSD.org> --------------ap96Hgd2pIdWiS5xKKXUe18P Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 S3lsZSBFdmFucyB3cm90ZToNCj4gT24gNS81LzI1IDAzOjU4LCBLb25zdGFudGluIEJlbG91 c292IHdyb3RlOg0KPj4gV2hhdCBpcyB0aGUgaW50ZW5kZWQgYXVkaWVuY2Ugb2YgdGhlIHNl dHVwPw0KPj4gV2hvIHdvdWxkIG5vdCBpbnN0YWxsIG5vcm1hbCBnaXQgcG9ydCBidXQgc3Rp bGwgd2FudCAvdXNyL3NyYyBwb3B1bGF0ZWQ/DQo+PiBGb3Igd2hhdCBwdXJwb3NlPw0KPiBJ J20gdGhpbmtpbmcgbGVzcyBhYm91dCBzcmMgaGVyZSBhbmQgbW9yZSBhYm91dCBwb3J0cywg d2hlcmUgZW5kLXVzZXIvIA0KPiBzeXNhZG1pbiBtYXkganVzdCB3YW50IGEgc2ltcGxlIG1l Y2hhbmlzbSB0byBrZWVwIHRoZWlyIHBvcnRzIHRyZWUgDQo+IHVwZGF0ZWQgKGFzIGEgcmVw bGFjZW1lbnQgZm9yLCBlLmcuLCBwb3J0c25hcCkuDQo+IA0KSSd2ZSBzZWVuIHNvbWUgdXNl ciBjb21wbGFpbnRzIGFib3V0IGhhdmluZyB0byBpbnN0YWxsIGEgcG9ydCwgaWUgDQpzb21l dGhpbmcgbm90IHBhcnQgb2YgYmFzZSwganVzdCB0byBjbG9uZSBhbmQgdXBkYXRlIG91ciBv d24gdHJlZXMuIFRvIA0KbWUgKGFuZCBvdGhlciBmb2xrcyB3aG8gd2VyZSB1c2VkIHRvIHVz aW5nIGdpdCgxKSB0byBiZWdpbiB3aXRoKSB0aGlzIGlzIA0KYSBtaW5vciBkZXRhaWwsIGJ1 dCBJIGNhbiBzZWUgaG93IHNvbWUgb3RoZXJzIGZlZWwgbm90IGhhdmluZyBhIGdpdCANCmNs aWVudCBpbiBiYXNlIHZpb2xhdGVzIHRoZWlyIHVuZGVyc3RhbmRpbmcgYWJvdXQgYmFzZSBi ZWluZyBhICJjb21wbGV0ZSANCnN5c3RlbSIuDQoNCi0tIA0KQ2hhcmxpZSBMaQ0KLi4ubm9w ZSwgc3RpbGwgZG9uJ3QgaGF2ZSBhbiBleGl0IGxpbmUuDQo= --------------ap96Hgd2pIdWiS5xKKXUe18P-- --------------wQ4frTofBXnKczAdSBCiRPRU Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQRTQA7vBfo8y1zE1rpnj5NgWEFcygUCaBqrKQUDAAAAAAAKCRBnj5NgWEFcyt57 AP400HramnJrmDqjJb7qDTiIDOKErCcU+eN2SSBqRJIMOgD9FcBSFfIFfsPa/2fVXmTRpvIOX9Al R488JqTANOWN0AI= =hBm+ -----END PGP SIGNATURE----- --------------wQ4frTofBXnKczAdSBCiRPRU-- From nobody Wed May 7 10:58:55 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsshL39c2z5w7Sq for ; Wed, 07 May 2025 10:58:58 +0000 (UTC) (envelope-from des@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsshL2P8cz47cw; Wed, 07 May 2025 10:58:58 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746615538; 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=9l7lokvRe9zg525YpHLL5eS7Ew83YkYBwVG5KhN9oSc=; b=s/MyfzmYNCgg5gvG1SYH9h5HOVIVci7ddatmxfPhlB15TQOWgBWcG581uFCTyMOY65Te2l zgoNgvoTlt5teOF5HkppIbDGHO96od6iy83r5FpR1XawL5wCACNubxirRP6OWbKmsjL6G1 q9XEuMs9xBjjZdwTQfURoGR49PMoxPDOKPAJA+ZY87r2yZITapp5KAvgD11xFG/JJe7HWw T0yJtd7CH+GS7Ag+hBUKthvOYtHdsuDH1805XJ4k57YpXho2CDYtNinkeyxSwzlrRN7l+q Ww699uEkYEihzHq5P0b6Jq7en1nsNGiW/409oFte+bvXQQAJCQR/bmdj6+JZgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746615538; 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=9l7lokvRe9zg525YpHLL5eS7Ew83YkYBwVG5KhN9oSc=; b=SWIP7JjFGAzANf1HtZnn7Mk/0c82Jt1tKBsfTI1bf4ILEYMEET5hif1PWyKlCDD55bpleG kFLuBcP5K7R4mg7B5x7rD63jcZDX+jR140tWmL2l/kT5ZFP6JkghgxHuOVBjxCXIAPTU5X bTqkmz/PkIZF1bQTlTkVrt5CTcJltFF72JL1UcPf1hrEJUwvlooDNH4Tmsf98ann92g7JO j/HqStygdaEYR0B1aHDMf4B4jdILdSnSAv9R2Ru4aPMs5fqaVZgIiDDw7MqMY0NqK3/XDy WZU500B72qvqwxxf6siAEXmNoSOu2vTvzhuPkBBlfzF9iuofeTqOn6VSBBbRdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746615538; a=rsa-sha256; cv=none; b=yiDqXjWmiC21BtiBGwlIdYFciscSwwPhSu8VNjJy0OOEFHWUgFgtT4NWi9nO5KtXNPiUdi /58OAR8WSrDuvWpZIPdyfbBFKmEhgrnA+gB3WBAymPKtCS94cXdAUcQ5pg2+KMbV17JrYN mn943hQG06Bak4d89mQjMycEQniVMD1C0Kp6HDn99u7wG1bYEN4S3ClEt2ZtXE6a43n30w PwmSBdvkXt+jyQVjLtGvH5O2jOFDQmR/QeieUelEZOjDgxX0SxkmJgR8Co09ESU6Y5Vn2M AYHm1m/NMit98Sfm08ifM8Fx9GzMQLG/p/dobAZJWG38syVrXtr37j1Lar1a4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZsshL143Rz3vx; Wed, 07 May 2025 10:58:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id A3D0C14FD41; Wed, 07 May 2025 12:58:55 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Olivier Certner Cc: Kyle Evans , freebsd-git@freebsd.org Subject: Re: got(1) in base consideration In-Reply-To: <2029663.vslOlgHxSZ@ravel> (Olivier Certner's message of "Tue, 06 May 2025 10:36:01 +0200") References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <2029663.vslOlgHxSZ@ravel> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 07 May 2025 12:58:55 +0200 Message-ID: <86plgku1ow.fsf@ltc.des.dev> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Olivier Certner writes: > I've never used 'got' so far, but is it impossible to just checkout > the bare repository without creating any worktrees? I've never used got either, but you should be aware that in git terminology, =E2=80=9Cbare=E2=80=9D refers to a clone that only has the obj= ect store, without what we'd call a working copy in cvs or svn terminology. A normal clone has the object store in .git, plus a checked-out (and possibly modified) copy of a tree, plus a (possibly empty) index (everything you've `git add`ed but not yet committed). Worktrees are _additional_ checked-out trees which don't have a full copy of the object store; instead of a .git directory, they have a .git file which contains the absolute path to the directory within the main clone's .git directory that contains the worktree's metadata. (The core aka =E2=80=9Cplumbing=E2=80=9D of git is nothing more than an obj= ect store where each object is referenced by its sha1 hash. VCS functionality is implemented entirely in the UI aka =E2=80=9Cporcelain=E2=80=9D. In that co= ntext, most objects represent one particular version of one particular file; some objects are trees which map paths to file objects; yet other objects are commits which associate a tree with metadata such as author, committer, log message etc. and zero, one, or two references to previous revisions from which this one is derived. A branch is just a reference to the object representing its most recent commit; it serves no other purpose than user-friendly naming and preventing that commit, and all of its ancestors, from being garbage-collected. A tag is the same as a branch except that the porcelain won't let you commit to a tag.) DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed May 7 12:14:25 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsvMY0xgDz5wCrf for ; Wed, 07 May 2025 12:14:33 +0000 (UTC) (envelope-from olce@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsvMY0HBXz3gYC; Wed, 07 May 2025 12:14:33 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746620073; 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: in-reply-to:in-reply-to:references:references; bh=FR1QKVM/m9UiVXwCzEMlh6ugGIMGybjrlQ4nl2b2b5g=; b=e3FSrm6WuWVu5txKgRLyQ3IIHVMOuwKSw0zj/Uo6p+2v1v2c7mLE6TzaM4v4F5YgQqLQmq 8BYiq+9dteAQzq5oPavN+dUu+izHGASASBQ2O398sJX4AlaPSJg0VGuPyjac3OVFcPTqOe R31TzK9/vsni96dKpc2UU+h0Ua+0dGkp3xNYdUzZQWvfz900Tvs6JSJBUfqkod3XgZ765R RPuYAxefVsMFHWZ5AWJCcNf2930gBvuLF9UYu2taBBuy9XAsTFckiBn9HWA28FmJUxwexV eDRuGcS0tXyPGsMS91MyWLGArTGxvGXQ0Q0+RItTgIi6TeHto8+aw+VOTsUAbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746620073; 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: in-reply-to:in-reply-to:references:references; bh=FR1QKVM/m9UiVXwCzEMlh6ugGIMGybjrlQ4nl2b2b5g=; b=CoyAGaYH/9wn2PN/z2/ZbHuqhY06zB9RyQQKoPniUdErP2cSujaeBW3Q82FWUTS9lpNvOY aH7Y3pdOVvUasYl5aPPaMlamZssFf89bn62RdUiOReB8eclF5+o6bC9ly81BL8d6uGJY4e keSdnErA3NCmX/H7QGHyPAmyo1cWgMn5nO+967w1NsoXQN6NJEanh/keSHOEt6mhPgsAif wFYhAsP6QhSDxpMdT7D87xz5p8hnn9hjxJKli2/YzoXYIgTq6C7LaPjgRcCQnC335nnvcB 9vWxJbCLrbN9cQ5ug5KXen4Xe/jaa4Q3Vvx3j/BA+ZSQgF8I9hBj4pJA2qXmBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746620073; a=rsa-sha256; cv=none; b=ur6/0qbZ6RdaxjHXd/fYKsvWVgNqM0oCICtPvN9POZS0lDTvrGe287Phwrdsip9BAYmLH6 ohvihQJsMODp22zfG/l51/LDf5d2UjVBL2kn9KFfzIe7SDwA28izglpMFuywmnfOqTPCSZ UXBzSSdX3eDfKSGxvtZVfI1uyOUxwxaz46eI+mmQ+djVFKTR0y0u6J95Rq9TsjbdCtsCYB LrRRMrEXuRXMBhTzUM5P1lG06z8Fc+Dw15moABsCzJKePtix6KX4BN6FC8p9XoZdrz+2n7 xqohLb0VMtzqpKe//0dujOjlI/In4nddnSrbOyPNh/NgKq7PcaE39m3LlbD3vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZsvMX3z1pz4jW; Wed, 07 May 2025 12:14:32 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Dag-Erling =?ISO-8859-1?Q?Sm=F8rgrav?= Cc: Kyle Evans , freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Date: Wed, 07 May 2025 14:14:25 +0200 Message-ID: <4182725.BRNeRiNLvY@ravel> In-Reply-To: <86plgku1ow.fsf@ltc.des.dev> References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <2029663.vslOlgHxSZ@ravel> <86plgku1ow.fsf@ltc.des.dev> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2423798.mfXeX5GmMH"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart2423798.mfXeX5GmMH Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Olivier Certner To: Dag-Erling =?ISO-8859-1?Q?Sm=F8rgrav?= Cc: Kyle Evans , freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Date: Wed, 07 May 2025 14:14:25 +0200 Message-ID: <4182725.BRNeRiNLvY@ravel> In-Reply-To: <86plgku1ow.fsf@ltc.des.dev> MIME-Version: 1.0 > I've never used got either, but you should be aware that in git > terminology, =E2=80=9Cbare=E2=80=9D refers to a clone that only has the o= bject store, > (snip) Yes, I'm quite versed in git (how it works included) and am perfectly aware= of that. I used "bare" knowingly. Actually, I've been using worktrees for a long time with bare repositories,= where there is no "first"/privileged worktree that has a real '.git' direc= tory, which IMO is much more natural and has the advantage of avoiding foot= =2Dshooting if one day you decide to remove some worktree that unfortunatel= y was the main one. =20 > (snip) True, known. =2D-=20 Olivier Certner --nextPart2423798.mfXeX5GmMH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmgbTqEACgkQjKEwQJce JicSZxAAsAQVeMqo65BSmFvZ+mmn42bIH2Pltb7wROaTqKUJylk7RsKfnc8HBT6o IUGwmHmTTXrnOLnPwHGPY01tfHl72Ewc+6JYrcbnVsvzJsLS7dChd3xdVe7yS9dT jSk/D04yyHYQ2f1KucrbMmhkyhwRcPUHszSzXPyPVJLiw0VTFmIDGDMkB9ctETuq XacIkeiA/PgZKnOcK0ay4HFIFl7uw9dyGXaBfBf8ZMTeHubEjWXjL+bKnG1+OUnL voK1MsIwcB7hDldJrL2eX/WdjfvIymhiuSoEC6Ln22CitRrqRfYewRkHaw/KmTwp znqn7WITwQ6EQCFrLEAJ3696WlM+b/iH5BQ6TJkwfIeAsllbKjdiKUwWjcvFGCEb 1dQ/aDfOu5IRCY7Tk4QmPilIP+L8I8ndf87zsSU/6My1JAUN2eLAW9xRDn/M8YDV +a3VilKopKH2OQlrNtMmC0lBVYb/DpEtOHLVNP1DjPypaHAdM9sKgiVPWq5gD2Fy 30vU5RD96Ouyi1hRoPqx6WxbdRRs0+FDwTPVGpQQdw1hAxIXTdogdUXCe9QfiXVx +9epUxVvfjgZaSF0SwQgk0HeRZ9UAf/Bwi4vOFvPDO2fS9ADKZ6LUYf+6h4lVQ2H 8vYrSahZJ8evTftOZnrn/EZUuZYtEeIDQUUjuaH4ogFMSZYmdq8= =YjZN -----END PGP SIGNATURE----- --nextPart2423798.mfXeX5GmMH-- From nobody Wed May 7 18:03:21 2025 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt38B0Kdkz5wYJG for ; Wed, 07 May 2025 18:05:14 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mail.inka.de (mail.inka.de [IPv6:2a04:c9c7:0:1073:217:a4ff:fe3b:e77c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt3882FLYz3CN3 for ; Wed, 07 May 2025 18:05:12 +0000 (UTC) (envelope-from naddy@mips.inka.de) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of naddy@mips.inka.de designates 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c as permitted sender) smtp.mailfrom=naddy@mips.inka.de; dmarc=none Received: from mips.inka.de (naddy@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1uCj8i-006phz-6T; Wed, 07 May 2025 20:05:04 +0200 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.18.1/8.18.1) with ESMTP id 547I3L9c030970 for ; Wed, 7 May 2025 20:03:21 +0200 (CEST) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.18.1/8.18.1/Submit) id 547I3Lvd030969 for freebsd-git@freebsd.org; Wed, 7 May 2025 20:03:21 +0200 (CEST) (envelope-from naddy) Date: Wed, 7 May 2025 20:03:21 +0200 From: Christian Weisgerber To: freebsd-git@freebsd.org Subject: Re: got(1) in base consideration Message-ID: References: <9f48a955-5f8a-450c-94c1-2a7d9d69ecb9@FreeBSD.org> <2029663.vslOlgHxSZ@ravel> <86plgku1ow.fsf@ltc.des.dev> <4182725.BRNeRiNLvY@ravel> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4182725.BRNeRiNLvY@ravel> X-Rspamd-Queue-Id: 4Zt3882FLYz3CN3 X-Spamd-Bar: / X-Spamd-Result: default: False [0.59 / 15.00]; NEURAL_SPAM_LONG(1.00)[1.000]; NEURAL_HAM_SHORT(-0.99)[-0.990]; NEURAL_SPAM_MEDIUM(0.88)[0.876]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; FREEFALL_USER(0.00)[naddy]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; MISSING_XM_UA(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[inka.de]; FROM_HAS_DN(0.00)[] Olivier Certner: > Actually, I've been using worktrees for a long time with bare repositories, where there is no "first"/privileged worktree that has a real '.git' directory, which IMO is much more natural and has the advantage of avoiding foot-shooting if one day you decide to remove some worktree that unfortunately was the main one. That's exactly how Got works. It always clones a bare repository, and you can check out worktrees at will. Generally speaking, Got uses the Git repository format and network protocol. It interops with Git. Beyond that, there is no particular similarity. -- Christian "naddy" Weisgerber naddy@mips.inka.de