From owner-freebsd-git@freebsd.org Sun Feb 7 16:24:36 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 B65F7530BD7 for ; Sun, 7 Feb 2021 16:24:36 +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 4DYZHS4nfhz4nvH for ; Sun, 7 Feb 2021 16:24:36 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id A4659530CC4; Sun, 7 Feb 2021 16:24:36 +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 A4301530C48 for ; Sun, 7 Feb 2021 16:24:36 +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 4DYZHS1Y6tz4nXJ for ; Sun, 7 Feb 2021 16:24:36 +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 117GOXID013586 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 7 Feb 2021 17:24:33 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 7 Feb 2021 17:24:33 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday 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: 4DYZHS1Y6tz4nXJ 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, 07 Feb 2021 16:24:36 -0000 On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Spörlein wrote: >Hi folks, > >It's another one of those instances where the hashes will change >(starting with all commits from Jan 5th 2021 forward). > >Our latest ports committers were not added to the authormap file in time >_and_ this stopped being a fatal issue in the converter a while ago :/ > >Please bear with us a while longer. >Thanks >Uli > >PS: This also affects the src and doc repos, but they will obviuously >not be changed again, see the errata notes at >https://github.com/freebsd/git_conv/tree/next This has now been pushed and the new hashes (and missing authornames!) are live. Sorry again for the inconvenience. Uli From owner-freebsd-git@freebsd.org Sun Feb 7 16:34:40 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 35447531406 for ; Sun, 7 Feb 2021 16:34:40 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DYZW36Fbtz4pTn for ; Sun, 7 Feb 2021 16:34:39 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D6897531243; Sun, 7 Feb 2021 16:34:39 +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 D65235311AC for ; Sun, 7 Feb 2021 16:34:39 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYZW35QxKz4p5D for ; Sun, 7 Feb 2021 16:34:39 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x730.google.com with SMTP id a19so12172112qka.2 for ; Sun, 07 Feb 2021 08:34:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=2rGLX1MRVkgr5SrkY9R6FQuUnP1nuoTIZC+fFnw5u8U=; b=ic5aQZ0QbLzLkBvnxWtoqmJrvzPA91YuKKXWHTkG+khLiaBszv8ajctXI8hij3JfEv 3fUnaOkM91uRxYb5epy1LkOr9usjyeKJbP6SCNdpdgZ3UqX24k5KDjoxL2xzwcDe3Dck muDurhqn2udTRBQAgK9sthjQW9g+y53N+m3s2/Zivf1k2r4uyzLVFuBfKHQc5zx0AvoI RHgrSMo26BfvP/17Ex/qRwdaW3Ac/BMDwGXJG2HfsGr5jNWpAwET0RG5TwGBHnZ4J/Cz PKCOeqiKWpAGSNyRJ+STYv8rELEMI4GtbgXMuBvrmnKssDFWm/ATnv7jKo7vHhTEDh/L 8F8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2rGLX1MRVkgr5SrkY9R6FQuUnP1nuoTIZC+fFnw5u8U=; b=Ry/C3qnKRZPbImJYXcoAwiIonse0QbcQtVBmhBL7VtRKoQeSHWG53fN7IR5V0KSzzh 5TiNo0N9+lCEwz2m0BakxaH8/7t3oC3XB66pQ393+Hp/IgY6ofGtdOzBdB6HUAom/bmf lR9LluqLHlfnmhMJYPrEQvTLE/Yd1xV9F9rFVLcBmMjHXZuSZAIkbsSPl5rD83HjE3Hn hPoCiwei6MzY3uEv5vX757iFH5SshjlmNwWxSJmI41Qqyp/dlL54wI8AFjMPAS/hiy71 UcqUuSXuo6L2fFuIGKqDtawlUlYRhIR905zjX4PpOYhLK3biscEvd37KeiN6OgvyhZuQ Rnow== X-Gm-Message-State: AOAM533GYo8WGhfIUpF2bLJ4rbNq2WHM12Ov1aw5byTdUNqzEMmUI2lZ HJdKDYg3aMtZjjPjPERXZ9xIOpNfXpyl4A== X-Google-Smtp-Source: ABdhPJy4Z01xDEskFJRWrb2CU61vPqClm7ds449oylRvo5+cuolppGlHl/JcIVP7/Sbe4QhTj0B/Fg== X-Received: by 2002:a05:620a:2226:: with SMTP id n6mr12835805qkh.193.1612715678871; Sun, 07 Feb 2021 08:34:38 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id h63sm13198611qtd.14.2021.02.07.08.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 08:34:38 -0800 (PST) Date: Sun, 7 Feb 2021 11:34:37 -0500 From: Shawn Webb To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="laa6gis5qr6kbenz" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DYZW35QxKz4p5D X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 07 Feb 2021 16:34:40 -0000 --laa6gis5qr6kbenz Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=F6rlein wrote: > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=F6rlein wrote: > > Hi folks, > >=20 > > It's another one of those instances where the hashes will change > > (starting with all commits from Jan 5th 2021 forward). > >=20 > > Our latest ports committers were not added to the authormap file in time > > _and_ this stopped being a fatal issue in the converter a while ago :/ > >=20 > > Please bear with us a while longer. > > Thanks > > Uli > >=20 > > PS: This also affects the src and doc repos, but they will obviuously > > not be changed again, see the errata notes at > > https://github.com/freebsd/git_conv/tree/next >=20 > This has now been pushed and the new hashes (and missing authornames!) are > live. Sorry for what may seem like dumb questions, but I just wanted to make sure: 1. For downstream projects that have already switched to git.freebsd.org for src, do we need to deal with changed hashes again? (ie, git merge --allow-unrelated-histories) 2. Do I now need to merge unrelated histories on ports if I use ports from github? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --laa6gis5qr6kbenz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgFpsACgkQ/y5nonf4 4fptCQ//Tj3JXqCj2Wqe6nLeinVqw0R19bNQUEWWCCjL6Na4BRP046F5fFE8qHcY oLPpEoCj0TxG5GmUUY3T6+q6IpIC6CbmzcodyoaMsNpRYTFQNBDvHHo6ncpAMAxi llUu3SsiX3UDvN3KEfEWgGdeTNsEfABpr3Ryzo1Eru6p8OJJIfUynPYgQPAGygMm Q+msAyG8Nu1ZSxFUD6TN2F4HpDzQB1Uh5Z9JYYfrsIvSURGS6Rz/G1k9ufyB+Pgy cjd5UeR6xEYWM3UBULe9ny97OzNIo629i2kYAyHR+iG5vLsaErdkQyPqr10H987E CrUV4VDAUjXl+R40fD380EkS6XNPMVRB0EXyIrp1PcQejxRgiAhZByJ4QUUAsdZc 3SP4XYBAouRoEx6zzI0Zaxrb8uofxwqQ/XSBrOAkERsIUDN9Ne2eTBGtj+mI20LP VYekA5p1FSDC4E/tIkmtx6OQUfho+jE9F77KhoiOkMe3k94gue4VZ+svppW/UhS6 bzlJ9Hb528OlcgTnnhZVjPjQ5IWiocOpNJcnhpsNziL/97JqG7jgfUVdNAb/NrWq 5vcvNtkCV+MbDVzlWxuz1iWc6sDIPmv+O2RTKvNyCyAKAAvV2VAlQ6JxGXrwx00T qWxRRK7/xSzQSJkB58+0li9APqe0q3lg89fwWpalsyCy3A6IAo0= =Wll/ -----END PGP SIGNATURE----- --laa6gis5qr6kbenz-- From owner-freebsd-git@freebsd.org Sun Feb 7 17:21:12 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 8EEC053231A for ; Sun, 7 Feb 2021 17:21:12 +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 4DYbXm3cTPz4rL2 for ; Sun, 7 Feb 2021 17:21:12 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7BA1E532054; Sun, 7 Feb 2021 17:21:12 +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 7B5FD531A51 for ; Sun, 7 Feb 2021 17:21:12 +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 4DYbXm1ZLwz4rNq for ; Sun, 7 Feb 2021 17:21:11 +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 117HLAu6017268 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 7 Feb 2021 18:21:10 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 7 Feb 2021 18:21:10 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Shawn Webb Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DYbXm1ZLwz4rNq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 07 Feb 2021 17:21:12 -0000 On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: >On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Spörlein wrote: >> On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Spörlein wrote: >> > Hi folks, >> > >> > It's another one of those instances where the hashes will change >> > (starting with all commits from Jan 5th 2021 forward). >> > >> > Our latest ports committers were not added to the authormap file in time >> > _and_ this stopped being a fatal issue in the converter a while ago :/ >> > >> > Please bear with us a while longer. >> > Thanks >> > Uli >> > >> > PS: This also affects the src and doc repos, but they will obviuously >> > not be changed again, see the errata notes at >> > https://github.com/freebsd/git_conv/tree/next >> >> This has now been pushed and the new hashes (and missing authornames!) are >> live. > >Sorry for what may seem like dumb questions, but I just wanted to make >sure: > >1. For downstream projects that have already switched to > git.freebsd.org for src, do we need to deal with changed hashes > again? (ie, git merge --allow-unrelated-histories) Nothing changed for src. >2. Do I now need to merge unrelated histories on ports if I use ports > from github? Depends a bit. There is shared history, but it forkes off way in the past, so if you have work on custom branch, it might indeed be easiest to merge with --allow-unrelated-histories. (I personally would probably write out the merge commit manually myself, it's much easier than figuring out what sort of flags one needs on the `git merge`.) Of course, if you're using rebase-based workflows, this all will be rather trivial to rebase. hth Uli From owner-freebsd-git@freebsd.org Sun Feb 7 17:46:51 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 E4A57532C1F for ; Sun, 7 Feb 2021 17:46:51 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.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 4DYc6M349Cz4ssg for ; Sun, 7 Feb 2021 17:46:51 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 676F95328C7; Sun, 7 Feb 2021 17:46:51 +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 6736B532C80 for ; Sun, 7 Feb 2021 17:46:51 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYc6M2DZ7z4sxB for ; Sun, 7 Feb 2021 17:46:50 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qv1-xf34.google.com with SMTP id 2so6006727qvd.0 for ; Sun, 07 Feb 2021 09:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=qi46fPXkEB1lhRB2Xvl7dvXKPVK/hoDrcTvsd993dB4=; b=FWRGjIzOGq8gDjtASZIW1cb+oyl9MvtK/Ak2SPaflE3PZU91I/ZMhNX4iiQXPwWbmm qFcade2PEkCXvUQDIhjEj171NupMSaUbXpmPqpxI2ClFceqZximK0vcglZYVU/iFBKak mT4HQ2Br4SLviWfZGOROTeHFnBx2lyylRvJyvjhJHHWKV62NIqwtnM7fjcjYAv1IF1xe QOWR5ZAGXaOjRjaUcMLpVuO2mEV9/8FLfjAdMGafn64OBvChUHZfmSm7txn/CjHthaYx f2vk1+ZCdVD8CgYi7CYPTSe25N4z6OSdOIDtU1edicUt5pcEo/2P4J3Ld3zpv9wTCUns uXmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=qi46fPXkEB1lhRB2Xvl7dvXKPVK/hoDrcTvsd993dB4=; b=VacjjOLT9boZGo4Ju9TKnUbzFVn1LNTktRumMbuKsT+z2UVWI6r9Q3gbFVfrqRjK8F moz3YpAz5FbWZC8YljvB3ZYOxsg47ivRB0AfVaRG8hERuNjHKc1XPAWyw96g3dIPV6cH S+J5Yxjsk0iYXNDzKpft6aFwdaVrQjQCgEEFgI0yPdIuunKAiQl++QNXPkx3d7osXNUR hspGkRiNpQV+FK47cLhezPfl0l8E8GZ2vwH3yCeG16Oh5oBTptgZSsRDDd+bPIMilGTE HmXy2NUTBT3Migry7iW/DeWQwdI1LMsyjTDRFKh4FBHdll09JI9FoouOdRkaE6MtN4+0 JDQw== X-Gm-Message-State: AOAM531uinLlDNTvbMcdHU3V2wNM+7DEpRYRJsYIQePtJgq7/LeGBAAm AJHbI4K/sQdhZ2N/x+0lPBMuOhOQLHol1A== X-Google-Smtp-Source: ABdhPJxaPdYyRdczWZcTAr9iCqLu7DsSUHKXYgojEx4oeMMTVONeQFoPLbm99sVJHI+MyafIQOLjig== X-Received: by 2002:ad4:4f41:: with SMTP id eu1mr13086338qvb.34.1612720009830; Sun, 07 Feb 2021 09:46:49 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id d14sm13014299qtc.25.2021.02.07.09.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 09:46:49 -0800 (PST) Date: Sun, 7 Feb 2021 12:46:48 -0500 From: Shawn Webb To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="c3njv3jvm45nlvrf" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DYc6M2DZ7z4sxB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 07 Feb 2021 17:46:52 -0000 --c3njv3jvm45nlvrf Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Sp=F6rlein wrote: > On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: > > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=F6rlein wrote: > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=F6rlein wrote: > > > > Hi folks, > > > > > > > > It's another one of those instances where the hashes will change > > > > (starting with all commits from Jan 5th 2021 forward). > > > > > > > > Our latest ports committers were not added to the authormap file in= time > > > > _and_ this stopped being a fatal issue in the converter a while ago= :/ > > > > > > > > Please bear with us a while longer. > > > > Thanks > > > > Uli > > > > > > > > PS: This also affects the src and doc repos, but they will obviuous= ly > > > > not be changed again, see the errata notes at > > > > https://github.com/freebsd/git_conv/tree/next > > >=20 > > > This has now been pushed and the new hashes (and missing authornames!= ) are > > > live. > >=20 > > Sorry for what may seem like dumb questions, but I just wanted to make > > sure: > >=20 > > 1. For downstream projects that have already switched to > > git.freebsd.org for src, do we need to deal with changed hashes > > again? (ie, git merge --allow-unrelated-histories) >=20 > Nothing changed for src. >=20 > > 2. Do I now need to merge unrelated histories on ports if I use ports > > from github? >=20 > Depends a bit. There is shared history, but it forkes off way in the past, > so if you have work on custom branch, it might indeed be easiest to merge > with --allow-unrelated-histories. >=20 > (I personally would probably write out the merge commit manually myself, > it's much easier than figuring out what sort of flags one needs on the `g= it > merge`.) >=20 > Of course, if you're using rebase-based workflows, this all will be rather > trivial to rebase. Thanks for the info! HardenedBSD uses a merge-based workflow since we plan to be around a while. Switching to rebased-based would have negative consequences to our downstream vendors. One more question: when ports is officially switched over to git, are we likely to see hash more hash changes? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --c3njv3jvm45nlvrf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgJ4IACgkQ/y5nonf4 4fpYPg//UEa/vwb6IZ39E9B1tfSPzWUCetnDKXcCYj32AhRnVU/SiMNzpAACruym 1oAt17AlrB1q7cvIdJsSDiugvZaklgW/b6hUEl8yRaS4i/Gqgy1xuSy3HWCv2+F/ VgGhYnVlMjatYPmZVZEgHnBIAc46y2ewvANxxKhyopWostXkPo+75ffyAXD2WJgT vAXXtmqYKLtAKzUQQdpfvk6SRjXDJxevCe5+M/Ko4ydy06aqMD0DrKtwRlpxYLT7 5JxMFfWVPC3QZAcOLo65n3suucj9Sa5O5utJptMN8DOk+JDvHP2avNDVsTjiaZWA Ehc4tEo0Ft+YX1MKKtyj0kB4Y/5F5/qHbB2M4nAfmraGWH+CcUzya2fweV7UMDUw 5HELYsN5G9nRsDroqOhcm42h5MOzXXiToloLA1zygwBdK+e+UAL/6WdETSwbU0OH eAmV1ceUjEisJvTlfAjYkvPEMch1H1FFeCy/0JNXVHpIEhrUTM+SMlQgdGOsXWsH lQJ1O0NtjXn9hp+o6y6nGAk4xVTLKnx/99+7N5Aby1ZdoQ8FRl+fqPf+wGC7NZ90 wzyDOAnSGiGiVGqJ2Z4R2J8n7piEMTWTIVMPOkIfqBCyqQ6/aXyvBwCbAn0HJtrM yMEhH5JMRp1c0l/sZZHEft+cXoNN6sQ1+glDVgeYTUj/hyg3o8k= =a9xy -----END PGP SIGNATURE----- --c3njv3jvm45nlvrf-- From owner-freebsd-git@freebsd.org Sun Feb 7 19:48: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 229A45355BD for ; Sun, 7 Feb 2021 19:48:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DYfpx73H6z3HPh for ; Sun, 7 Feb 2021 19:48:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D44415354FA; Sun, 7 Feb 2021 19:48:41 +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 9130C5354F8 for ; Sun, 7 Feb 2021 19:48:41 +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 4DYfpx1N5Wz3H7k for ; Sun, 7 Feb 2021 19:48: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 117JmdOF027181 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 7 Feb 2021 20:48:39 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 7 Feb 2021 20:48:38 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Shawn Webb Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DYfpx1N5Wz3H7k X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 07 Feb 2021 19:48:42 -0000 On Sun, 2021-02-07 at 12:46:48 -0500, Shawn Webb wrote: >On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Spörlein wrote: >> On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: >> > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Spörlein wrote: >> > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Spörlein wrote: >> > > > Hi folks, >> > > > >> > > > It's another one of those instances where the hashes will change >> > > > (starting with all commits from Jan 5th 2021 forward). >> > > > >> > > > Our latest ports committers were not added to the authormap file in time >> > > > _and_ this stopped being a fatal issue in the converter a while ago :/ >> > > > >> > > > Please bear with us a while longer. >> > > > Thanks >> > > > Uli >> > > > >> > > > PS: This also affects the src and doc repos, but they will obviuously >> > > > not be changed again, see the errata notes at >> > > > https://github.com/freebsd/git_conv/tree/next >> > > >> > > This has now been pushed and the new hashes (and missing authornames!) are >> > > live. >> > >> > Sorry for what may seem like dumb questions, but I just wanted to make >> > sure: >> > >> > 1. For downstream projects that have already switched to >> > git.freebsd.org for src, do we need to deal with changed hashes >> > again? (ie, git merge --allow-unrelated-histories) >> >> Nothing changed for src. >> >> > 2. Do I now need to merge unrelated histories on ports if I use ports >> > from github? >> >> Depends a bit. There is shared history, but it forkes off way in the past, >> so if you have work on custom branch, it might indeed be easiest to merge >> with --allow-unrelated-histories. >> >> (I personally would probably write out the merge commit manually myself, >> it's much easier than figuring out what sort of flags one needs on the `git >> merge`.) >> >> Of course, if you're using rebase-based workflows, this all will be rather >> trivial to rebase. > >Thanks for the info! HardenedBSD uses a merge-based workflow since we >plan to be around a while. Switching to rebased-based would have >negative consequences to our downstream vendors. > >One more question: when ports is officially switched over to git, are >we likely to see hash more hash changes? No, of course not. Once the conversion has been finalized, none of the history or metadata will be touched retroactively. We'll then have to live with errors basically forever. Cheers Uli From owner-freebsd-git@freebsd.org Sun Feb 7 21:59:16 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 4CE5053AE14 for ; Sun, 7 Feb 2021 21:59:16 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.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 4DYjjb68Byz3k1n for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D2E0653AD55; Sun, 7 Feb 2021 21:59:15 +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 D117653AE13 for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYjjb5FQ0z3k9n for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x72e.google.com with SMTP id a12so12615719qkh.10 for ; Sun, 07 Feb 2021 13:59:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ud5N5wDG8ZEQ1xHyb2gP+Imf8czd+QBSbTyUWdPQ9j8=; b=O6CZz2FdTPlmfa1nxf6gvofNGFhlPqcsDJKNa9O1Sda+9fArjrLpq6NozGaf0rIRFd v01sM1sZG57G8xIqkTsPbUh2iDYZIGYR7pIbiv5Svekh5BntGlWUByp0WGefpE5Knkio LipzJmSwWiSCOrNPHIGllAQrtjfbNFJGATCX+pDl00SChIKzHGzrYxAghMTFHP2dFaUb Qm/+4TrxUIMka6sBQugknpmTPVMMu/kfiZWhEhb2qm2yeJtmjIcQ/HfOBAbOROMDs/0v Wm+BBscAsXLdzC5dnE8juDOWF72yOk1Vy40iBKNPsRnUErSNA2KFHvFiw9JaSDnhsbxG TNKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ud5N5wDG8ZEQ1xHyb2gP+Imf8czd+QBSbTyUWdPQ9j8=; b=QKEasDpVkyjzZkYlKIvYIdktwWR2r4orJUip9xw95yJp17AtruAJIGhDT8P3xKJMm6 E90MLH0I1sXjToIfD4UDV6zie/rHH0G/krekEjPTyor8sEck4ebw3DvUJpLkzLzWyY8T A+4wxl5YYjmSEFSvI2EFIQTNP94kSZqBSIuiK0LOnlSzWhx5c401gLOARM/oBY9qBMmA j+w7n/BaqNxLypVbNMakp/T/WVuWc1XnISl6gV2N89iLGfnA4cI5V0NumZlgO/KKg6Io WAcynQjmu6Exc/pZ4H+N81miNPjVPnhgsRpvukikJ6RpJ8EnYBL13uBunEwKA4yXJVXd ZRrg== X-Gm-Message-State: AOAM5311RRNqu8HPmRolmK3NogR6eSrdE82B8RhWk+H9oGiR+KaP7toe /cQQv1jbWF2Hs4VIER2JS9ZtALd1Oj/A7w== X-Google-Smtp-Source: ABdhPJwukWTIp9+c1Qt8cL6hYofofuZY1d1iZkj82Sz8fOFzCYw9U4FmX+7gIxTw6ing7GNaUSAtaA== X-Received: by 2002:a37:a3cc:: with SMTP id m195mr13575239qke.400.1612735154598; Sun, 07 Feb 2021 13:59:14 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id r4sm15299044qkf.112.2021.02.07.13.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 13:59:13 -0800 (PST) Date: Sun, 7 Feb 2021 16:59:13 -0500 From: Shawn Webb To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="i5muybcg5e6jupbt" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DYjjb5FQ0z3k9n X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 07 Feb 2021 21:59:16 -0000 --i5muybcg5e6jupbt Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 07, 2021 at 08:48:38PM +0100, Ulrich Sp=F6rlein wrote: > On Sun, 2021-02-07 at 12:46:48 -0500, Shawn Webb wrote: > > On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Sp=F6rlein wrote: > > > On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: > > > > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=F6rlein wrote: > > > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=F6rlein wrote: > > > > > > Hi folks, > > > > > > > > > > > > It's another one of those instances where the hashes will change > > > > > > (starting with all commits from Jan 5th 2021 forward). > > > > > > > > > > > > Our latest ports committers were not added to the authormap fil= e in time > > > > > > _and_ this stopped being a fatal issue in the converter a while= ago :/ > > > > > > > > > > > > Please bear with us a while longer. > > > > > > Thanks > > > > > > Uli > > > > > > > > > > > > PS: This also affects the src and doc repos, but they will obvi= uously > > > > > > not be changed again, see the errata notes at > > > > > > https://github.com/freebsd/git_conv/tree/next > > > > > > > > > > This has now been pushed and the new hashes (and missing authorna= mes!) are > > > > > live. > > > > > > > > Sorry for what may seem like dumb questions, but I just wanted to m= ake > > > > sure: > > > > > > > > 1. For downstream projects that have already switched to > > > > git.freebsd.org for src, do we need to deal with changed hashes > > > > again? (ie, git merge --allow-unrelated-histories) > > >=20 > > > Nothing changed for src. > > >=20 > > > > 2. Do I now need to merge unrelated histories on ports if I use por= ts > > > > from github? > > >=20 > > > Depends a bit. There is shared history, but it forkes off way in the = past, > > > so if you have work on custom branch, it might indeed be easiest to m= erge > > > with --allow-unrelated-histories. > > >=20 > > > (I personally would probably write out the merge commit manually myse= lf, > > > it's much easier than figuring out what sort of flags one needs on th= e `git > > > merge`.) > > >=20 > > > Of course, if you're using rebase-based workflows, this all will be r= ather > > > trivial to rebase. > >=20 > > Thanks for the info! HardenedBSD uses a merge-based workflow since we > > plan to be around a while. Switching to rebased-based would have > > negative consequences to our downstream vendors. > >=20 > > One more question: when ports is officially switched over to git, are > > we likely to see hash more hash changes? >=20 > No, of course not. Once the conversion has been finalized, none of the > history or metadata will be touched retroactively. We'll then have to live > with errors basically forever. I worded that horrifically wrong. I blame the lack of caffeine. ;) I meant to ask: is there any possibility that the hashes will change again before the official switch to git? Sorry for the miscommunication. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --i5muybcg5e6jupbt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgYq4ACgkQ/y5nonf4 4fr2XhAAk9ZtWenxcjbgHFYnMr/Kr8VqZmUJ4Zq0y2qGheWfty8/cLI37URIiciW UnTvv5db+cJnWfAAXS4KAtry7TrI73jYnvNK2rNGLqBVtleTOKS0wjN1IYXD3sSV eTUjryANIfblrPnNYqDdfet6ZzQFeh9kW3oeeDR93hh3ARJbifdq8kbV7/IgeQEz CoYQ51bIACsSdDIpDDJNNNYZxbTD/ielGx25iKY3NXnB0gAvzHH21cQ7AixKsimR tp5sSFf6Ak4Zjw7EP5XIC7t7mzeRaBgZOoazz/FxG1+ivzf5oYzdEGAJJlgbpzFD pPyuVBNdDyORfNu8MdprV5nCXqkIzmqAf9HbVncXTNL65geDmPbF4snTKxdymP04 4MPtelN2PENNxXjBWIgatoHI0i+XXqR6BM3A30zS1ofMwiWqI3Bmzmp2BbZbiLa3 6R/2M6TdppzgXkNcU/6EXBSU7sv0SIctaJRpNd1ngAb1VB1oFM362HMJkJJaJJSN z3h7N4bCU//zvAp7LMBPBXjz2bnEEcXuL/SCZNaMzt3fIW/SWrWlUzHApG0E+9/i POgqYViVWLJZd4YzX5TMwHS629sozD9mBhoDkN1sYJNK+aMS8hNEFIkoQDZaK+W2 1jU9l6ncw8ZoVz5VN7bF7Vkj/gFl4V2iBXRa3oYgPk6rujz4YRQ= =g96B -----END PGP SIGNATURE----- --i5muybcg5e6jupbt-- From owner-freebsd-git@freebsd.org Sun Feb 7 22:10:56 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 E94B953B32D for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) 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 4DYjz44QkMz3krl for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 97CEC53AE6E; Sun, 7 Feb 2021 22:10:56 +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 9792353AF45 for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYjz43RNzz3kpp for ; Sun, 7 Feb 2021 22:10:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf31.google.com with SMTP id p6so160014qvm.12 for ; Sun, 07 Feb 2021 14:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wp57ek/jd+c6X0LkplLSuc6cWdvK3+dBDDrDo/4w7NQ=; b=n1QV7+4AdwuFSuxoYVSGX9qMW36T3Wc3hsKHh5IjM+S060Z9zj8EYbodSMpJvNU6lo NHdnRs2SKRKZ/7N+1KI5PPj10hN6rIVyy071Ynr1UgotMmTX4ProUo+fF66iA1LkpMDV rWUmtev1klb/gcEbI6k2bFXDhEsgPpDGiN05l7qMzSGGNLtCpqNoEtoaBEcUHsuhrUlZ 29FEPE61jWI3wMNm5tqRU1LWekoP3TOpWZias55L22YPGvRPCDozTGa1CvMxB8ef2FNN bXMsOsgNJSUOYje3Q+mF0jLz++4OcBadqoi83NpjZNmXiqE1DK2n9o8Fj2dFhWNT7odX 7r7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wp57ek/jd+c6X0LkplLSuc6cWdvK3+dBDDrDo/4w7NQ=; b=AiKL2L1h3iVCh/Kh8ygZBXxbSVeBBLQwcL8Uil6FdReX7V9res+EJ6UJSNw5+E+fwH LBURSjKVYElA8Yle1KPULkAhUugbkKFUWywdfm+s1dsUCiiJ/PZCthEfk26G2qPV+vo7 oi6TJAytvYyQYS46zwt1LZUlMbdR0fsuvm9iUo5hR2SS+Eh4TZtFgUui/2v/pAUfRYZo RYyiEekGcwkcXbqEel8yylyE3jMlNRCCUYL+PNSLmL7BnO28bEUuLPCAERtbyKvwSlc/ oNb4FQtKgmMkq70SPE3v6QxTQ+xvTYO1ERFjP2rS3F+QI85iH5NjkWq30+daBSt6ELkc pPKw== X-Gm-Message-State: AOAM533+yS0Y3Yn+MM91QCMZMSHtzVQDVc5NtyqGwZpcKy5e3Ofdzukw WSzPPNf3m6sMOeMYGfN0xH4RlTqBognWWoKUp8yoRux1VEI= X-Google-Smtp-Source: ABdhPJyrg8ROgxxXD7ny+sl5tv02ZG9fMfUsd2rODEAxq7/Doq6jS7c1QkOrMBmKzvdqHza40i9JYIfMtgGhwiKeXhI= X-Received: by 2002:a05:6214:14e2:: with SMTP id k2mr13532871qvw.24.1612735855404; Sun, 07 Feb 2021 14:10:55 -0800 (PST) MIME-Version: 1.0 References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> In-Reply-To: <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> From: Warner Losh Date: Sun, 7 Feb 2021 15:10:42 -0700 Message-ID: Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday To: Shawn Webb Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org X-Rspamd-Queue-Id: 4DYjz43RNzz3kpp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 07 Feb 2021 22:10:57 -0000 On Sun, Feb 7, 2021, 2:59 PM Shawn Webb wrote: > On Sun, Feb 07, 2021 at 08:48:38PM +0100, Ulrich Sp=C3=B6rlein wrote: > > On Sun, 2021-02-07 at 12:46:48 -0500, Shawn Webb wrote: > > > On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Sp=C3=B6rlein wrote: > > > > On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: > > > > > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=C3=B6rlein wr= ote: > > > > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=C3=B6rlein wrot= e: > > > > > > > Hi folks, > > > > > > > > > > > > > > It's another one of those instances where the hashes will > change > > > > > > > (starting with all commits from Jan 5th 2021 forward). > > > > > > > > > > > > > > Our latest ports committers were not added to the authormap > file in time > > > > > > > _and_ this stopped being a fatal issue in the converter a > while ago :/ > > > > > > > > > > > > > > Please bear with us a while longer. > > > > > > > Thanks > > > > > > > Uli > > > > > > > > > > > > > > PS: This also affects the src and doc repos, but they will > obviuously > > > > > > > not be changed again, see the errata notes at > > > > > > > https://github.com/freebsd/git_conv/tree/next > > > > > > > > > > > > This has now been pushed and the new hashes (and missing > authornames!) are > > > > > > live. > > > > > > > > > > Sorry for what may seem like dumb questions, but I just wanted to > make > > > > > sure: > > > > > > > > > > 1. For downstream projects that have already switched to > > > > > git.freebsd.org for src, do we need to deal with changed hashes > > > > > again? (ie, git merge --allow-unrelated-histories) > > > > > > > > Nothing changed for src. > > > > > > > > > 2. Do I now need to merge unrelated histories on ports if I use > ports > > > > > from github? > > > > > > > > Depends a bit. There is shared history, but it forkes off way in th= e > past, > > > > so if you have work on custom branch, it might indeed be easiest to > merge > > > > with --allow-unrelated-histories. > > > > > > > > (I personally would probably write out the merge commit manually > myself, > > > > it's much easier than figuring out what sort of flags one needs on > the `git > > > > merge`.) > > > > > > > > Of course, if you're using rebase-based workflows, this all will be > rather > > > > trivial to rebase. > > > > > > Thanks for the info! HardenedBSD uses a merge-based workflow since we > > > plan to be around a while. Switching to rebased-based would have > > > negative consequences to our downstream vendors. > > > > > > One more question: when ports is officially switched over to git, are > > > we likely to see hash more hash changes? > > > > No, of course not. Once the conversion has been finalized, none of the > > history or metadata will be touched retroactively. We'll then have to > live > > with errors basically forever. > > I worded that horrifically wrong. I blame the lack of caffeine. ;) > > I meant to ask: is there any possibility that the hashes will change > again before the official switch to git? > Yes. Given the src experience, it can't be ruled out and is likely. Warner Sorry for the miscommunication. > > Thanks, > > -- > Shawn Webb > Cofounder / Security Engineer > HardenedBSD > > GPG Key ID: 0xFF2E67A277F8E1FA > GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 > > https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/S= hawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc > From owner-freebsd-git@freebsd.org Mon Feb 8 21:00:21 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 4B8BD541BB1 for ; Mon, 8 Feb 2021 21:00:21 +0000 (UTC) (envelope-from michael.osipov@siemens.com) Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "goliath.siemens.de", Issuer "QuoVadis Global SSL ICA G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZJM83H5zz4rZ8 for ; Mon, 8 Feb 2021 21:00:19 +0000 (UTC) (envelope-from michael.osipov@siemens.com) Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 118L0HZm014655 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 8 Feb 2021 22:00:18 +0100 Received: from [192.168.1.23] ([144.145.220.50]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id 118L0HQP001343 for ; Mon, 8 Feb 2021 22:00:17 +0100 To: freebsd-git@freebsd.org From: "Osipov, Michael (LDA IT PLM)" Subject: gitup(1) in base Message-ID: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> Date: Mon, 8 Feb 2021 22:00:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DZJM83H5zz4rZ8 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=siemens.com; spf=pass (mx1.freebsd.org: domain of michael.osipov@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=michael.osipov@siemens.com X-Spamd-Result: default: False [-4.30 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[192.35.17.28:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+exists:192.35.17.28.spf.siemens.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[siemens.com,none]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15465, ipnet:192.35.16.0/22, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_HI(-0.50)[192.35.17.28:from] 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, 08 Feb 2021 21:00:21 -0000 Hi folks, I'd like to raise the question whether gitup(1) [1] can be included in base? * It has reached a good maturity level * John Mehr reacts quite fast to issues * It makes the base system complete and suitably replaces svnlite * It does not impose the huge complexity and dependency hierarchy of the original Git client on admins and other non-developers I've been testing back and forth in various combinations and it serves quite well on a test machine here. Michael [1] https://github.com/johnmehr/gitup From owner-freebsd-git@freebsd.org Mon Feb 8 21:29:32 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 BFE5F542458 for ; Mon, 8 Feb 2021 21:29:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZK0r0FSrz4svZ for ; Mon, 8 Feb 2021 21:29:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72c.google.com with SMTP id t63so16063303qkc.1 for ; Mon, 08 Feb 2021 13:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GFdiBl8S+KIEqRMVzEg4DU5YYyy0SQbqwNZMnFNG4yM=; b=PSyG+hBfdlBzrWWYYMLzBjBjwmEbnjVY1cw1jfonwFUIgNat6Lut8t2/HDqYBEmdQR rbxPNipx97F6w9Cv1X3o57lerjcvpS2G9VWlrqLw2sEp/YpDXghlnuejCMmWqmmtqIv7 ay3iuhO4jwZc6EBdiHJekudsuVQ3Ep9he+OvkWwcfncCTjgem8YcLN4mq5h4M3j4zepT mf0UPsbQJSbU0/9Ii1EVReDVnClQaGmmv7qZMXcS5aVPnaOR/GXEy6SDgfDEQfEqsNoC JarxelePVOzLDXjRDrx9Kl2ddBzMZ/U7ElJJBvWTbVLDMYH2cg9kUUwXVebxChu6ZOdZ PXrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GFdiBl8S+KIEqRMVzEg4DU5YYyy0SQbqwNZMnFNG4yM=; b=cY86gNZ19J9KiszzxXfIbJ9664sWu1i0mDuEIQyJDFndYoF+wRechi7b30l/PsHwxl OVutr6VXVgiznIHCF9Jd3Vvx80OugJ8Nbqgs93nfjxKEF+HxrcYAvJic7gGrnQvSVQMO fpRAoJ7Qi+KSxTjIUfMH6uD4SNR9Zcty/HtKm6fUoisgJ6WHlXucYHnUMJ3YrP0gDxVG o/GjvVXJKd1jFk7IhLlA5dAmkUhpfX3USYGQVJ1Ic2YA8egXsSxnB304pId/gc8VEb3M jNK3vZzuzGAPp8kJGxiQR+dJxcBabBiS9gxDj7rKSWwmcv5E81FsLZyODCU6E+kvSsyI z82Q== X-Gm-Message-State: AOAM5302YQIdlT3PeLcP9vMbIBNRGcTfRr6MI5GNuDpEGFECx5vKZQFB ooCh1cIaipYQd4+9cbf8eO+XWMyNsm3keMdboXi30oAoRQrchw== X-Google-Smtp-Source: ABdhPJzdX/7xs6V8ijBJT8zFg2Eyd6vCHZJwAeTv5n2XLGmwn/E0hIekklSY08N/QhoPB7XPgfiVFdBHuUb37H4j1GQ= X-Received: by 2002:a37:a34f:: with SMTP id m76mr18664022qke.89.1612819771104; Mon, 08 Feb 2021 13:29:31 -0800 (PST) MIME-Version: 1.0 References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> In-Reply-To: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> From: Warner Losh Date: Mon, 8 Feb 2021 14:29:20 -0700 Message-ID: Subject: Re: gitup(1) in base To: "Osipov, Michael (LDA IT PLM)" Cc: freebsd-git X-Rspamd-Queue-Id: 4DZK0r0FSrz4svZ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=PSyG+hBf; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72c:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72c:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 08 Feb 2021 21:29:32 -0000 On Mon, Feb 8, 2021 at 2:00 PM Osipov, Michael (LDA IT PLM) < michael.osipov@siemens.com> wrote: > Hi folks, > > I'd like to raise the question whether gitup(1) [1] can be included in > base? > On the whole, this is likely the right call. However, I have some quibbles... * It has reached a good maturity level > It seems adequate and seems to work for most of the main cases. However, it's still quite new which history suggests is a risk. I'd characterize it as beta quality since it works for the main cases and the rate of bugs we've seen in the past suggests there will be additional bugs. > * John Mehr reacts quite fast to issues > That mitigates the beta level of maturity somewhat though.... > * It makes the base system complete and suitably replaces svnlite > It's not clear that there's a consensus that we require this functionality in the base for it to be complete.... There's also not a clear consensus that there shouldn't be one in the base.... > * It does not impose the huge complexity and dependency hierarchy of the > original Git client on admins and other non-developers > This is quite true. This helps mitigate the risk of importing it. However, there's a lot of things happening in the git world that make it hard to know for sure. There's efforts to replace the hash algorithm, for example. > I've been testing back and forth in various combinations and it serves > quite well on a test machine here. > I think that on the whole this is a good idea, but with proper framing to mitigate future risks. If we put this into stable/13, then we're effectively committing to it for the next 3-odd years. This could land us in trouble should there need to change directions and use a different solution. We normally make stability guarantees for stable branches, and this brand-new software presents a risk in our ability to execute on this... Warner > Michael > > [1] https://github.com/johnmehr/gitup > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Mon Feb 8 23:00:44 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 60DF7545403 for ; Mon, 8 Feb 2021 23:00:44 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZM242Nztz3HSY; Mon, 8 Feb 2021 23:00:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:104b:9965:e3ac:c524]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id E367028B62; Mon, 8 Feb 2021 23:00:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) To: Warner Losh , "Osipov, Michael (LDA IT PLM)" Cc: freebsd-git References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> From: John Baldwin Subject: Re: gitup(1) in base Message-ID: Date: Mon, 8 Feb 2021 15:00:42 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit 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, 08 Feb 2021 23:00:44 -0000 On 2/8/21 1:29 PM, Warner Losh wrote: > On Mon, Feb 8, 2021 at 2:00 PM Osipov, Michael (LDA IT PLM) < > michael.osipov@siemens.com> wrote: >> * It makes the base system complete and suitably replaces svnlite >> > > It's not clear that there's a consensus that we require this functionality > in the base for it to be complete.... There's also not a clear consensus > that there shouldn't be one in the base.... I think if it's not a hassle it's probably worth having a git client in base. git itself would be a hassle due to licensing and dependencies, but having a way to fetch ports and src out of the box is probably useful. > I think that on the whole this is a good idea, but with proper framing to > mitigate future risks. If we put this into stable/13, then we're > effectively committing to it for the next 3-odd years. This could land us > in trouble should there need to change directions and use a different > solution. We normally make stability guarantees for stable branches, and > this brand-new software presents a risk in our ability to execute on this... So I think putting it into 13.0 and 13 right now probably is a risk. I think we could perhaps afford a slower path which might be to import it into HEAD but not target it for 13 until 13.1 or 13.2. This gives us time to have experience with having folks use it on head and having some burn-in time. We could also perhaps put some really clear sign posts around it in 13.0 if we did import it into 13 saying "this is subject to being removed or replaced during the branch", but I worry that even if we make really big signs some users will miss them, so my preference (for what it matters) is the slower path. -- John Baldwin From owner-freebsd-git@freebsd.org Tue Feb 9 00:45:54 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 1901D547667 for ; Tue, 9 Feb 2021 00:45:54 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZPMN6ZyVz3QWp; Tue, 9 Feb 2021 00:45:52 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pj1-x102c.google.com with SMTP id gb24so587108pjb.4; Mon, 08 Feb 2021 16:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:references:cc:from:in-reply-to :content-transfer-encoding; bh=JWEdlFw76MGuRctfD9oVVdufJmeEYIFXMtEIpXtq3KI=; b=I7BXvlzbMA+gYS3vpb/pdcSr4Qcb9MIgXyccOWRFFG22pBHu/OVKu5V8fKDbKo0I8j 6Tbr9ZHKYLF7+sH/8sv5KzgjM8E8eKO596xS5z2wX6FgwViG2p9Wpp76CfLuzD3axju4 2D54VyoNk3t216JqRSvxtga0cET8TuhamRe5PWLSB6fJxm+DW1hsfAQKkA3Escdp3o68 0bqz4kL1sXu7DT7lANjmlgHmd8/u+P9jxB/7VTaxTi/3y7ANf/5r+DgtTGkENT40QT8w iLKbqQaKoSyOrvQnKNgLsk/9ETvLYfX0oYVBH38Btk2hIqJFsh8qVpc6NEHOZaErwdHz IXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:references:cc:from:in-reply-to :content-transfer-encoding; bh=JWEdlFw76MGuRctfD9oVVdufJmeEYIFXMtEIpXtq3KI=; b=EVYbLZsMxKxtaNXEbvL+Y5X8satJgfXIRkNYOE78IoOXsonetR5itTgjQRcleKwZaD dLcmM02Wjsy95WqfCff/Ig1aaEKquOISyBq242KtZ8lo/0x1rBsP+S4SlmYrwL0ts8CN d6qSE+7pMQxIkjQ+GCBYqaytYL7GRQFiXtPKgiefmooXtS7/N0AodvHRrawFSySRnXbd rlyvydTtSVK0JGk+ssH9A8Gl61Ty2eRx0+yjWaaWqhExWB33z96RfVSaQmEn2Qkg5eEj /pSWfRdjbYRTYEEhtNKIyjvVf0RsMIMfrkoCQSHFsU8+E7aApYs0Q6z1MbwiSpEJd33b tVEQ== X-Gm-Message-State: AOAM532O2t3sUfrVlWwOMuofRUCHq1ylN6zmsDEuhmhn8Byx0ADlkbBC X/X+OkdvtPiFCecqmjGHLfbrMlWFDig= X-Google-Smtp-Source: ABdhPJxbwIUTOAGZlCRazHNDgIyZvnUUJa4QvaFH9Qq4a+ZX+U4xUKTIpwvGAhii7fASOA18s1xZgQ== X-Received: by 2002:a17:902:ec89:b029:df:d248:3763 with SMTP id x9-20020a170902ec89b02900dfd2483763mr18512049plg.37.1612831550452; Mon, 08 Feb 2021 16:45:50 -0800 (PST) Received: from ?IPv6:2403:5800:7500:3601:45e7:2cc5:3501:6443? ([2403:5800:7500:3601:45e7:2cc5:3501:6443]) by smtp.gmail.com with UTF8SMTPSA id y14sm7484775pfg.9.2021.02.08.16.45.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Feb 2021 16:45:49 -0800 (PST) Sender: Kubilay Kocak Message-ID: <970055c6-22c2-8c42-49f8-0293473dac84@FreeBSD.org> Date: Tue, 9 Feb 2021 11:45:46 +1100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Thunderbird/87.0a1 Reply-To: koobs@FreeBSD.org Subject: Re: Referencing git commit in the comment of Bugzilla Content-Language: en-US To: Yasuhiro Kimura , freebsd-git@freebsd.org References: <20210205.094644.1159184285479762732.yasu@utahime.org> Cc: Bugmeister From: Kubilay Kocak In-Reply-To: <20210205.094644.1159184285479762732.yasu@utahime.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DZPMN6ZyVz3QWp X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=I7BXvlzb; dmarc=none; spf=pass (mx1.freebsd.org: domain of koobsfreebsd@gmail.com designates 2607:f8b0:4864:20::102c as permitted sender) smtp.mailfrom=koobsfreebsd@gmail.com X-Spamd-Result: default: False [-3.19 / 15.00]; HAS_REPLYTO(0.00)[koobs@FreeBSD.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-0.99)[-0.993]; FORGED_SENDER(0.30)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::102c:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_NEQ_ENVFROM(0.00)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::102c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102c:from]; MIME_TRACE(0.00)[0:+]; 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, 09 Feb 2021 00:45:54 -0000 On 5/02/2021 11:46 am, Yasuhiro Kimura wrote: > Hell All, > > Doc and src have already migrated to git and ports will follow soon. > In this situation it's quite possbile that bug reporter wants to > reference git commit in the comment of bug report submitted to > Bugzilla. Then is there standard(?) way to do it? As for subversion > syntax such as "base r123456" or "ports r778899" is provided. And I > expect similar one is provided for git. > > Best Regards. > > --- > Yasuhiro Kimura > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > Could you create an issue in Bugzilla Services:Bug Tracker with title "Add support for git commit autolinking" Thanks! From owner-freebsd-git@freebsd.org Tue Feb 9 21:30:16 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 801E452BC3A for ; Tue, 9 Feb 2021 21:30:16 +0000 (UTC) (envelope-from news@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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZwzC4T1Vz3tQd for ; Tue, 9 Feb 2021 21:30:15 +0000 (UTC) (envelope-from news@mips.inka.de) Received: from mips.inka.de (news@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1l9aaE-00BaaS-7G; Tue, 09 Feb 2021 22:30:06 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 119LRrqb002044 for ; Tue, 9 Feb 2021 22:27:53 +0100 (CET) (envelope-from news@lorvorc.mips.inka.de) Received: (from news@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 119LRr7s002043 for freebsd-git@freebsd.org; Tue, 9 Feb 2021 22:27:53 +0100 (CET) (envelope-from news) To: freebsd-git@freebsd.org From: Christian Weisgerber Newsgroups: list.freebsd.git Subject: got(1) in base (was: Re: gitup(1) in base) Date: Tue, 9 Feb 2021 21:27:53 -0000 (UTC) Message-ID: References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> User-Agent: slrn/1.0.3 (FreeBSD) X-Rspamd-Queue-Id: 4DZwzC4T1Vz3tQd X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of news@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=news@mips.inka.de X-Spamd-Result: default: False [-1.80 / 15.00]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; FREEFALL_USER(0.00)[news]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[inka.de]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[naddy@mips.inka.de,news@mips.inka.de]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; FROM_NEQ_ENVFROM(0.00)[naddy@mips.inka.de,news@mips.inka.de]; 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, 09 Feb 2021 21:30:16 -0000 On 2021-02-08, "Osipov, Michael (LDA IT PLM)" wrote: > I'd like to raise the question whether gitup(1) [1] can be included in > base? Where are we with the inclusion of got(1) [1] in base? * It has reached a good maturity level * Stefan Sperling reacts quite fast to issues * It makes the base system complete and suitably replaces svnlite * It does not impose the huge complexity and dependency hierarchy of the original Git client on admins and other non-developers The original hold-up appears to have been an ex nihilo requirement that it must be Capsicum-ized. Somebody was working on this, but has gone silent. gitup is not Capsicum-ized either. [1] https://gameoftrees.org/ -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Tue Feb 9 23:45:20 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 AA6F752FE80 for ; Tue, 9 Feb 2021 23:45:20 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZzz40VXjz4Y8g; Tue, 9 Feb 2021 23:45:19 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oo1-f50.google.com with SMTP id x19so103724ooj.10; Tue, 09 Feb 2021 15:45:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vgFE7dhwsY64U6jBmbNNBtDrZkd7TawcXECqZDil9ZI=; b=a+zIMYGQD0SLifZ8umsLAeCxREEyJ3Uhcg760Vm0xcyEP1Zm5yqcjpwI5k7nFTw54A U4YCiM5Lb9CTnnqQSBk6QKr+8kK1t4elIlBVdpY1OVS6A0uq5uJuVibKxjAfMp8xin33 9iAkoCFYDwfvmIevIuhj9fmSleZC/HX+1lw05Sv/f+Zw9lfgP3vILe5x5jQ2NJ/RdzhI y51pSYONhk6LSQsoRoMCxTuQf3xjK0D+WTdaPk4shEx+Wgww4fBNlhi+XVQlucBoAZuf dzG7HotRkcmbR+1ObpqTkin6V9J4ixOVWIBnwPiDnnIZwTkdkEKuQ1WE+bwJ5L8qia3n ICWg== X-Gm-Message-State: AOAM530iD5lh6yeAfwDjwtLtHcBRVeYgmR3x/FYAsN9xVvbZOgDPJDSg FcXgx7To3aNVpDXq9P2SvTYXClT4JDJTTPLRV0FGwhr7ZjY= X-Google-Smtp-Source: ABdhPJyPu+ot3ssjUENdXCUpKodLgP07A9OehiSb+cjooymvHHaSHSklcySy7lQjIPOM+Sw6OpXOekSymKmDTOlOCQw= X-Received: by 2002:a4a:970b:: with SMTP id u11mr247387ooi.79.1612914318937; Tue, 09 Feb 2021 15:45:18 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Alan Somers Date: Tue, 9 Feb 2021 16:45:07 -0700 Message-ID: Subject: Re: Git status update To: Kyle Evans Cc: Brandon Bergren , Ryan Libby , John Mehr via freebsd-git X-Rspamd-Queue-Id: 4DZzz40VXjz4Y8g X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.161.50 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.161.50:from]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; RWL_MAILSPIKE_GOOD(0.00)[209.85.161.50:from]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_ZRD(0.00)[209.85.161.50:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.50:from]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 09 Feb 2021 23:45:20 -0000 On Wed, Feb 3, 2021 at 2:34 PM Kyle Evans wrote: > On Wed, Feb 3, 2021 at 3:31 PM Brandon Bergren > wrote: > > > > On Wed, Feb 3, 2021, at 1:45 PM, Alan Somers wrote: > > > > > > Ping. We're getting close to 13.0-RELEASE, and it's a real handicap to > > > have no working CI. What can we do to fix it? > > > -Alan > > > > Last I heard about it, lwhsu@ was going to get a dev copy of jenkins up > to allow testing the massive jjb changes that the git transition entails. > > > > At this point, testing in production seems like a better position to > be in than the current situation. :-) > > Thanks, > > Kyle Evans > And it's back! From owner-freebsd-git@freebsd.org Wed Feb 10 00:47:17 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 314DD532D19; Wed, 10 Feb 2021 00:47:17 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Db1LX3YgLz4cs5; Wed, 10 Feb 2021 00:47:16 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x332.google.com with SMTP id w4so376008wmi.4; Tue, 09 Feb 2021 16:47:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=FCwL+OGAivfyNTf5ePB+RWka54cKvJJF5lB5RNxHvZI=; b=D4ZMVeNIfh8CHARDBJGbYKqAx4sXhcAXH4cHQCRDgvdk91QUv8i9keixWHzcfPhL68 reunp9HQ5uDe/mWFBKHHZHZTtpRLQIaGxjUwAJo+MRyj3Q7T+TgBTqcvDW2NIs4qf9xA ydIU36BCeXePhjAHqFMDGFdS5VS4dQ2EJ4fHt0ducoA6TA5UB/WRtxRNHJtYy7UlFXpN lVI+27DXoxDnlrBvk1ceDeFt8CbTEPN8DL0hEAsUifex5E9wmS1IfgkroCIcRSQ60uNx ZQZllKYjbncNffeFlJnEH9+Iq+lYl0sAT6F7VpO/3HtsdWnXaT2e+ZtJ0oaQRgk2U9BT gjSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=FCwL+OGAivfyNTf5ePB+RWka54cKvJJF5lB5RNxHvZI=; b=ltedl0h/XW5/J4BKIzWIIhSNoh3ZLyevxzYwpHfVS9Qsy4JKZWfVRANJLDodMy72rW 31e+k1zkoNkJM8duvt0ERQi1u4QuplmDVEWkwRPHmN5Z5EzyHl+iO9aAgHJadq+Un+r4 MbMY09nxwHWPihHm3m9b7EZGbnR13tO7q3f18+WvzDM7dXotNH/9xEUjMgEf4j+SUhUz Fl9TiuMXn8jByLVq2xJ1R6QFDsj5zyEc1Qwsc889i2/tEpkJ4ie+7rnDPIzSHgJ3oG/V 0rNJUD3z8zos1pgV29mZZjFcGlgQgQwFPYi4+oe3h393bL/GPK82TFj0XyXMHWnY9KGl QARA== X-Gm-Message-State: AOAM530Jq4oDGbm8Le4TlIayWH9pklykkeBfGGhktqFmM6tI1SAWg2v1 3DlhPzkUYZs8u9IJ/6ap8M4CNv8BsFUqvw== X-Google-Smtp-Source: ABdhPJycCqmkCdbACWPj5WZ5CwDObXRn0/SOHNjDFEjcgZgCZCh+QDtwHEC+BpuvYLcvbBme5Q1JWA== X-Received: by 2002:a7b:c5cc:: with SMTP id n12mr539749wmk.123.1612918034347; Tue, 09 Feb 2021 16:47:14 -0800 (PST) Received: from [192.168.1.13] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id r11sm594197wmh.9.2021.02.09.16.47.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Feb 2021 16:47:13 -0800 (PST) To: freebsd-current Cc: freebsd-git@freebsd.org From: Graham Perrin Subject: cgit: orientation Message-ID: Date: Wed, 10 Feb 2021 00:47:12 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-Rspamd-Queue-Id: 4Db1LX3YgLz4cs5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=D4ZMVeNI; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::332 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; FROM_EQ_ENVFROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::332:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::332:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::332:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-current] 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, 10 Feb 2021 00:47:17 -0000 Given this, for example: – with 'stable' in the URL and 'stable/12' visible in the page – how would a reader know that the commit was to main (not stable/12)? Is there scope to make improved use of cgit, or is this a limitation of cgit? TIA From owner-freebsd-git@freebsd.org Wed Feb 10 00:52:45 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 A1397533172 for ; Wed, 10 Feb 2021 00:52:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Db1Sr56pyz4dYM for ; Wed, 10 Feb 2021 00:52:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id b14so161907qkk.0 for ; Tue, 09 Feb 2021 16:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IsjzMEV7CQAkQz0e7UnjFGWkBblbneXDhW/fco+8DbQ=; b=it1YsjD1dfc6do887EFninjhnuOTdXB1pXkrFSxURXkvxLBHcPbjn35mIIE0lxwWIL vIyIbMUW8HgxNzN5HcEr1lIWBhH5ZXtYCquZl7TMW+hGGoGJ5RGpXHAmLe3HlZC3ixU/ H19OKq6o1RsARtY8czOn8LjaSLsaX7hu6bPb8EZ1waIRCODJEUODR8dp1cQfSnII4ll8 psb0wpPF34R7jxNVaY+Qcxw5J8G1wSnxAmMmsX6OYBCRQmQpsWFk0iEbrFNNrxn55+RT fmUwORdWEwlvPOV8HdsUn/nk4r/Dfxn2IlwfZIi5JHYaM/Vj1G4G9oPWXsRTSMhIwt3W jeow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IsjzMEV7CQAkQz0e7UnjFGWkBblbneXDhW/fco+8DbQ=; b=KH9EbKUUx4hCHceJRiFwp9UuvL3iBrVDalty1MyhElF0//yKnYQRDOJT0DtQB2cLEy 2/Di8cmvI+aUW/6FF6aKHlb4xdv0TDcNqFHxAWz9SdgMT1mWqjiwhvftXFenEwPLgYv7 BBhe/wP9GMHo5WJRSmtr/BzQS7HKIbcxpBsMVBvFS+zb5YC//V5WX5+8XzxFPw5rP8VB UpdhhWRPflar3fnpDu4M5vSXa59DwYbk3Q7dBS13fqfEQCz7uDiqwp8AKGKtQ9KTyW19 vNmTLiXhRnCQQDLghDpZQJntW21HqTdQ1OjUttZWe8NBV/e/waWRSxI02cSf+949+wc+ XPIA== X-Gm-Message-State: AOAM531nb+4U5mmDJThgxe/+XJOYjyp416yls67LFLgz4hn+qzPi8CJg kB767KZ1v7Pyu6EAojX7XrDUSSr/lpdPMBcJ7fSHnw== X-Google-Smtp-Source: ABdhPJzTLcUCcVT355oC54/n8bCh/uUGlb2KZhSNnniMwqC4ng6/ZKIUh1z+swvWITSY5xVgsnXp8vFN4xHmgJjBrPc= X-Received: by 2002:ae9:f813:: with SMTP id x19mr955288qkh.359.1612918363642; Tue, 09 Feb 2021 16:52:43 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 9 Feb 2021 17:52:32 -0700 Message-ID: Subject: Re: cgit: orientation To: Graham Perrin Cc: freebsd-current , freebsd-git X-Rspamd-Queue-Id: 4Db1Sr56pyz4dYM X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=it1YsjD1; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72b:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72b:from]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 10 Feb 2021 00:52:45 -0000 On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin wrote= : > Given this, for example: > > < > https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc077f= c3155251c&h=3Dstable%2F12 > > > > =E2=80=93 with 'stable' in the URL and 'stable/12' visible in the page = =E2=80=93 how > would a reader know that the commit was to main (not stable/12)? > > Is there scope to make improved use of cgit, or is this a limitation of > cgit? > There's a pulldown in the upper right corner that says 'stable/12' though it took me a while to find it as my eyes glided over it a couple of times. Warner > TIA > > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Wed Feb 10 00:53:44 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 59AE753352A for ; Wed, 10 Feb 2021 00:53:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Db1Tz2JRbz4dyn for ; Wed, 10 Feb 2021 00:53:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2c.google.com with SMTP id j13so101108qvu.10 for ; Tue, 09 Feb 2021 16:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=A28sEpV3cxXE6Ouh2DBgFutAuzQnlXrQ0DbJxKZl9Ho=; b=kaQ46VEQVl0MVoJCxFtKFNK+zUtk62we+Zo5yWD4aAVnAk9+Uy9SBNCYGzeE6aL8+n 50ydXa21/SMHaoSjuMKoSeMF3k+0OYWlHOdXFQU0Ib49TC8yVEpo0vsi2YidTxLIDN0y brJYMGtuYd/W0/bU49dENNIZOuPjHvJGqV1wSUSmpz2qoPOj549wKtEoLDU65OVm+n3c p4NdZk9SaF5yNXPnw7K54+1o3T4D0Gcpuwo5OQBpDdwudR5pwP/KTsynrhSUfxw9Mpmo 03anM31QydwYm51Aq8TvB/FGMQjKnubrhhlX3G2egjuZe6DQxcJezrYJT5KFbkWtPHC5 lu1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=A28sEpV3cxXE6Ouh2DBgFutAuzQnlXrQ0DbJxKZl9Ho=; b=d6RqWkesKq5KhvfcOyUAQpkUU61Fu0xpQkwaS5McNV13vbhtcIBc8/N4ds1onTN1sp vTcvZu/pZJzjy5yqhzyJ+j+6VttcSETD4AUUEN/1HIcZdoVinRulhsP9Nb/KCpjbjryY 7TaEPSlKtLYwbevwAjKvvmgnEIZzfHy9pi8wJpdPp/nsPw5mQ1JCIcIyJS5ilCYviVbS MzAthjqe2wATPwvH7ES0f93ueal3j/vABIzVT75hRt5UZ2JWf28+eSHcfvZ3mVHveX7D 22zzU/5fPBLCq7WVUm5Uvd/Vosb8E1U2Ti+nilEm9JSMZ1qE3z2ujZKET3dET51tA/yI YowQ== X-Gm-Message-State: AOAM530+Z5/wp+rVUYSDBCzfQq7Zkfj0AFeEy3an5vbfDEbpNOlO6OH6 YktMo5qR5r2h6uW2X4UPZha1q9h+spt66uBIPbGDZ02GWZowTw== X-Google-Smtp-Source: ABdhPJzNMXabYkt9jyGMjP5oIExkQLRmC5iQy8rABjYBX3IOv+Q1fyDTrdi9IAGEVl2WWt8bw8Ny3Qi7mfwN1hyCIb8= X-Received: by 2002:a0c:abce:: with SMTP id k14mr457983qvb.23.1612918422549; Tue, 09 Feb 2021 16:53:42 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 9 Feb 2021 17:53:31 -0700 Message-ID: Subject: Re: cgit: orientation To: Graham Perrin Cc: freebsd-current , freebsd-git X-Rspamd-Queue-Id: 4Db1Tz2JRbz4dyn X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=kaQ46VEQ; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2c:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2c:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 10 Feb 2021 00:53:44 -0000 On Tue, Feb 9, 2021 at 5:52 PM Warner Losh wrote: > > > On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin > wrote: > >> Given this, for example: >> >> < >> https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc077= fc3155251c&h=3Dstable%2F12 >> > >> >> =E2=80=93 with 'stable' in the URL and 'stable/12' visible in the page = =E2=80=93 how >> would a reader know that the commit was to main (not stable/12)? >> >> Is there scope to make improved use of cgit, or is this a limitation of >> cgit? >> > > There's a pulldown in the upper right corner that says 'stable/12' though > it took me a while to find it as my eyes glided over it a couple of times= . > But that is due to the stable%2F12 in the URL... W/o it, it's no good. Warner Warner > > >> TIA >> >> _______________________________________________ >> freebsd-git@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/freebsd-git >> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >> > From owner-freebsd-git@freebsd.org Wed Feb 10 08:28:43 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 8219253F1F5 for ; Wed, 10 Feb 2021 08:28:43 +0000 (UTC) (envelope-from stsp@stsp.name) Received: from einhorn-mail-out.in-berlin.de (einhorn-mail-out.in-berlin.de [217.197.80.21]) (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 "mail.in-berlin.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbCZy2t28z3P5k for ; Wed, 10 Feb 2021 08:28:41 +0000 (UTC) (envelope-from stsp@stsp.name) X-Envelope-From: stsp@stsp.name Received: from authenticated.user (localhost [127.0.0.1]) by einhorn.in-berlin.de with ESMTPSA id 11A8Sa9m019011 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 10 Feb 2021 09:28:39 +0100 Received: from localhost (byrne.stsp.name [local]) by byrne.stsp.name (OpenSMTPD) with ESMTPA id b9386929; Wed, 10 Feb 2021 09:28:35 +0100 (CET) Date: Wed, 10 Feb 2021 09:28:35 +0100 From: Stefan Sperling To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: got(1) in base (was: Re: gitup(1) in base) Message-ID: Mail-Followup-To: Christian Weisgerber , freebsd-git@freebsd.org References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DbCZy2t28z3P5k X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of stsp@stsp.name has no SPF policy when checking 217.197.80.21) smtp.mailfrom=stsp@stsp.name X-Spamd-Result: default: False [-2.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[stsp.name]; RBL_DBL_DONT_QUERY_IPS(0.00)[217.197.80.21:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[217.197.80.21:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-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:29670, ipnet:217.197.80.0/20, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_LOW(-0.10)[217.197.80.21:from] 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, 10 Feb 2021 08:28:43 -0000 On Tue, Feb 09, 2021 at 09:27:53PM -0000, Christian Weisgerber wrote: > On 2021-02-08, "Osipov, Michael (LDA IT PLM)" wrote: > > > I'd like to raise the question whether gitup(1) [1] can be included in > > base? > > Where are we with the inclusion of got(1) [1] in base? > > * It has reached a good maturity level > * Stefan Sperling reacts quite fast to issues > * It makes the base system complete and suitably replaces svnlite > * It does not impose the huge complexity and dependency hierarchy of the > original Git client on admins and other non-developers > > The original hold-up appears to have been an ex nihilo requirement > that it must be Capsicum-ized. Somebody was working on this, but > has gone silent. An intern at the FreeBSD Foundation was working on capsicum support. This intership has now ended which is probably the reason why work on the topic has stalled. I am still open to working with developers from the FreeBSD community, reviewing and integrating changes that make it easier to apply capsicum patches to this code base. I'd like to keep the got.git repository free of patches that won't apply to OpenBSD because I don't want to end up having to co-maintain changes which target other systems. I am doing this in my spare time. Maintaining the OpenBSD version is already giving me enough things to worry about. There is now a got-portable.git repository which currently targets Linux. This repository is maintained by Thomas Adam. Perhaps full FreeBSD + capsicum support could be integrated there first, and the result integrated into FreeBSD base? Please talk to Thomas if this sounds like a good plan. From owner-freebsd-git@freebsd.org Wed Feb 10 15:09:02 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 2DC37549809 for ; Wed, 10 Feb 2021 15:09:02 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: from mail-yb1-xb2a.google.com (mail-yb1-xb2a.google.com [IPv6:2607:f8b0:4864:20::b2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbNSs2mS3z4b1l for ; Wed, 10 Feb 2021 15:09:01 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: by mail-yb1-xb2a.google.com with SMTP id r2so2284488ybk.11 for ; Wed, 10 Feb 2021 07:09:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=NO4MI/I8CfSegKGtkYzm738iHZmULKhmpcaDdxkiRSs=; b=N/z1Hm4APCY/OlxZvQ5g4pI5FXeCJdKbNcpj7VPLVdUDiNlFDDylP/4w/E//zunLWX xblAnRA6uAih5u53o3cET/bWqZEmY+QUzVde0RosTvLh6cGkjAybFaRm81xzeSmBj3IT cLBtXm3LLlzykXoDonwICXdqZNSZmfhPC9W8hQ2b4ZB8CISU+gxc3ACexz91CTFsCEPD xocR7w1wSB2MG8K1elz46AGNjiT/2kgwVgGlIdJ424C5qLR88lp6DDf4MPoSqUwiG5fB uIpIvoC9JalMm10r7UNlvZLtHbytvW9OFxBVQAk/xFFrIkgdAPzWc91x8+e6D9xgRxLn +4IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=NO4MI/I8CfSegKGtkYzm738iHZmULKhmpcaDdxkiRSs=; b=gTHKj39EWqMBLCR5MrCyT5nvABA3G01nZqxonXtd+hb9QkQmuXdYRBMCv8Do4p9mCb d+3DtUErClXRiFT0RBrb3d/gkZk99rIBmhxr6M115bfR13MOGqx/kutYRROdciCZesf0 8wsCPaT7sUJBF1djV8F2qtytXureoz7elC7fOP5aa6cszkOW9jsaClu4hNZXEzwLBHYu culHO0pCRZl592mKUrNarPHHzK9XPPlQ49kBWhZ3KhHewDvMMPiH2G2x5j369eSkvcz8 CZS+Al1PXsUZv/KY9jP47x6JQoEv9DDsfyVcALkCPNoNTYh3pjI+dwR6oRDpsW1vLtuR qNjw== X-Gm-Message-State: AOAM531MO59/t7LQW9ZR8lvNhS8/mlA5XrCulyHhCuLodpyv8zfL6Xbw kUnADS6E6ty7XkBgVzeEyzmVwlxyOVI+CG1SrTcw5WQT1ltNfg== X-Google-Smtp-Source: ABdhPJylxebjC578oQ4PhV3VGuBlnKy8E9eXoFgUIDdnBJqMVgHGtvZi22+IvBP9P+xRyEaRH6ez2bSZdUA5YapKDIk= X-Received: by 2002:a25:2747:: with SMTP id n68mr4751011ybn.190.1612969740467; Wed, 10 Feb 2021 07:09:00 -0800 (PST) MIME-Version: 1.0 References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> In-Reply-To: From: "Uni T. Runker" Date: Wed, 10 Feb 2021 09:08:49 -0600 Message-ID: Subject: Re: got(1) in base (was: Re: gitup(1) in base) To: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4DbNSs2mS3z4b1l X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=N/z1Hm4A; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of unitrunker@gmail.com designates 2607:f8b0:4864:20::b2a as permitted sender) smtp.mailfrom=unitrunker@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::b2a:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::b2a:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b2a:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 10 Feb 2021 15:09:02 -0000 On Wed, Feb 10, 2021 at 2:28 AM Stefan Sperling wrote: > There is now a got-portable.git repository which currently targets Linux. > This repository is maintained by Thomas Adam. > Perhaps full FreeBSD + capsicum support could be integrated there first, > and the result integrated into FreeBSD base? > Please talk to Thomas if this sounds like a good plan. > I looked at got in late 2019 - it had the following OpenBSD dependencies: 1. pledge, unveil, recallocarray. 2. imsg (which thankfully already exists in ports as part of libopenbsd). 3. endian.h 4. util.h 5. SIMPLEQ_XXXX Using the portable version as a base for FreeBSD makes sense to me. However, Christian did a lot of work to make got run on FreeBSD. Christian - what's your opinion on this? From owner-freebsd-git@freebsd.org Wed Feb 10 16:48:00 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 C19EB54C11C for ; Wed, 10 Feb 2021 16:48:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbQg36lwmz4jp4 for ; Wed, 10 Feb 2021 16:47:59 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f180.google.com with SMTP id a16so2446650ilq.5 for ; Wed, 10 Feb 2021 08:47:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=tbWRZXoV+RRF5O4h2V40rAIonu0mf6JEK4wTqqyip/4=; b=f/jpOUWjoH0WlkQf908RtByBsUF5JCn2W90i+3HHIBfPgdYylS9jZ6ey0Se8XhwIEb ZqwblPC85m4Sbz9m7Cukjy4ChUfUTCro/i4G4M7/mmoQ2Awd291p7sUPwvQ6rOmaPtck bSsTV6REqv4nixv2//CziwJoGolM0/92anHmYGGO9gGu1SpN4idU+qvwPZ/Hokp0teeT 63gzmt/wg8p0LZdFTSrz8Ufu/Xt4FlZzE35ShhOZWdjkVHgMpG8HkRuv8bfnUmyyW+DD +AxpJLtJ0Q+vt6kryVTifsHpIYydQ9FsO+1qD2axPfyITG3fAjiofemf4okTGeGsinWZ kfKQ== X-Gm-Message-State: AOAM5311BNKO79CwvE6EEcVr6BF0Q/jBTHoVJ9sMe/a1K+HX4HpM44DG wMZLkr/3mp05bzf8v3HnE6LJuSr5SZhH8lozek6AFPr2rkk= X-Google-Smtp-Source: ABdhPJzk0iKyVhy3rMyoX8AnN42X9chMMiPQdeeqcVVNXW7xdr6SEH2fVdPeTitmTnP9YyWAWFF73p/YkWuHj9Qoa4s= X-Received: by 2002:a05:6e02:1312:: with SMTP id g18mr1965292ilr.182.1612975678836; Wed, 10 Feb 2021 08:47:58 -0800 (PST) MIME-Version: 1.0 References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> In-Reply-To: From: Ed Maste Date: Wed, 10 Feb 2021 11:47:32 -0500 Message-ID: Subject: Re: got(1) in base (was: Re: gitup(1) in base) To: Christian Weisgerber , freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DbQg36lwmz4jp4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.180 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.91 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.91)[-0.913]; RCPT_COUNT_TWO(0.00)[2]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.180:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_NA(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.166.180:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.180:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.180:from]; RCVD_COUNT_TWO(0.00)[2]; 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: Wed, 10 Feb 2021 16:48:00 -0000 On Wed, 10 Feb 2021 at 03:28, Stefan Sperling wrote: > > An intern at the FreeBSD Foundation was working on capsicum support. > This intership has now ended which is probably the reason why work on > the topic has stalled. Indeed. My plan was to either pick up the Capsicum work myself or have someone else take it on, but I've had a lot of other work in progress and haven't been able to make any progress on it yet. I do hope to get back to it soonish. From owner-freebsd-git@freebsd.org Wed Feb 10 18:15: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 8509254EDD5 for ; Wed, 10 Feb 2021 18:15:10 +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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbSbd6G7Xz4s2Z for ; Wed, 10 Feb 2021 18:15:09 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mips.inka.de (naddy@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1l9u13-00C0sQ-SZ; Wed, 10 Feb 2021 19:15:05 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 11AIAdVr002823 for ; Wed, 10 Feb 2021 19:10:39 +0100 (CET) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 11AIAdBG002822 for freebsd-git@freebsd.org; Wed, 10 Feb 2021 19:10:39 +0100 (CET) (envelope-from naddy) Date: Wed, 10 Feb 2021 19:10:39 +0100 From: Christian Weisgerber To: freebsd-git@freebsd.org Subject: Re: got(1) in base (was: Re: gitup(1) in base) Message-ID: References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DbSbd6G7Xz4s2Z X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of naddy@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=naddy@mips.inka.de X-Spamd-Result: default: False [-2.10 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; FREEFALL_USER(0.00)[naddy]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[inka.de]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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:202113, ipnet:2a04:c9c7::/32, country:DE]; RCVD_TLS_LAST(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: Wed, 10 Feb 2021 18:15:10 -0000 "Uni T. Runker": > Using the portable version as a base for FreeBSD makes sense to me. > > However, Christian did a lot of work to make got run on FreeBSD. Christian > - what's your opinion on this? Well, I created the existing devel/got port. It identifies all portability issues that concern FreeBSD and solves them. It should be the obvious starting point for an import into base. I'll happily contribute to get a "-portable" effort to build on FreeBSD eventually, but that's orthogonal to importing got into base. -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Wed Feb 10 18:25:07 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 EC87654EEDA for ; Wed, 10 Feb 2021 18:25:07 +0000 (UTC) (envelope-from news@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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbSq73rmpz4sqm for ; Wed, 10 Feb 2021 18:25:07 +0000 (UTC) (envelope-from news@mips.inka.de) Received: from mips.inka.de (news@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1l9uAk-00C148-AB; Wed, 10 Feb 2021 19:25:06 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 11AILBY0005301 for ; Wed, 10 Feb 2021 19:21:11 +0100 (CET) (envelope-from news@lorvorc.mips.inka.de) Received: (from news@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 11AILAgt005300 for freebsd-git@freebsd.org; Wed, 10 Feb 2021 19:21:10 +0100 (CET) (envelope-from news) To: freebsd-git@freebsd.org From: Christian Weisgerber Newsgroups: list.freebsd.git Subject: Re: gitup(1) in base Date: Wed, 10 Feb 2021 18:21:10 -0000 (UTC) Message-ID: References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> User-Agent: slrn/1.0.3 (FreeBSD) X-Rspamd-Queue-Id: 4DbSq73rmpz4sqm X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of news@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=news@mips.inka.de X-Spamd-Result: default: False [-1.80 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[news]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[inka.de]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[naddy@mips.inka.de,news@mips.inka.de]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; FROM_NEQ_ENVFROM(0.00)[naddy@mips.inka.de,news@mips.inka.de]; 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: Wed, 10 Feb 2021 18:25:08 -0000 On 2021-02-08, "Osipov, Michael (LDA IT PLM)" wrote: > * It makes the base system complete and suitably replaces svnlite No. gitup is a replacement for cvsup in checkout mode. Which may well be what people want, but let's not pretend that it is a replacement for svnlite. There is no history. You updated your machine, and now subsystem X is broken. You could check the history, identify a suspicious commit, revert it and fix your machine while you contact the committer. Not with gitup. In fact, svnlite allowed to contribute (i.e. commit) to FreeBSD, which none of the suggested alternatives permit. -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Wed Feb 10 19:29:48 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 28D95528889 for ; Wed, 10 Feb 2021 19:29:48 +0000 (UTC) (envelope-from mat@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbVFm0gmcz3DRJ; Wed, 10 Feb 2021 19:29:48 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E319EF0A4; Wed, 10 Feb 2021 19:29:47 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:42:0:7907:8bd4:2fdd:23f5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 64793942D80; Wed, 10 Feb 2021 19:29:45 +0000 (UTC) Date: Wed, 10 Feb 2021 20:28:21 +0100 From: Mathieu Arnold To: "Osipov, Michael (LDA IT PLM)" Cc: freebsd-git@freebsd.org Subject: Re: gitup(1) in base Message-ID: <20210210192821.xhmirf2q5mfgls2p@aching.in.mat.cc> References: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7tayz57lskrdvkiu" Content-Disposition: inline In-Reply-To: <49046db6-88d9-d59d-85f5-ecc1321b07c6@siemens.com> 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, 10 Feb 2021 19:29:48 -0000 --7tayz57lskrdvkiu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Mon, Feb 08, 2021 at 10:00:17PM +0100, Osipov, Michael (LDA IT PLM) wrot= e: > Hi folks, >=20 > I'd like to raise the question whether gitup(1) [1] can be included in ba= se? >=20 > * It has reached a good maturity level > * John Mehr reacts quite fast to issues > * It makes the base system complete and suitably replaces svnlite > * It does not impose the huge complexity and dependency hierarchy of the > original Git client on admins and other non-developers >=20 > I've been testing back and forth in various combinations and it serves qu= ite > well on a test machine here. I don't quite understand why this need to be put in the base system. If you want to use gitup, you `pkg install gitup`, if you prefer to use git, you `pkg install git`. This makes sure you always have the latest version, and as a bonus, you don't have to build it. With the base system moving to being packaged with pkg, if you want to install some part of the base system, you will have to do `pkg install FreeBSD-foo` anyway. Wether you have to type `pkg install FreeBSD-gitup` or `pkg install gitup` does not change anything. --=20 Mathieu Arnold --7tayz57lskrdvkiu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmAkM9BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKubA/+Js0DOvOKY+JXVEI2ksVivaOXfgvuxbLrs3G+l4mZVlfiV82Uj2WxoGZu r1q20vExbcnNKMrwy04fua4Fu16FKqnF5rAc25fGRun66mVzDpHo8mHUY8ApUrDO gzo7VOR0sL/w4FNwNyFyu/Y4AAotYoUUyTAjOyf3FnK5prn3OPPPw1mV3z1Fn6wc WFRH/icadwIaiEBfkx6Ujhn6z6z3QvW2HFQm+n8uEv6K3msPpIHXoAHgcx6JYiTs isYL8WlhxopQSA2tDfi7FQClTVCj263NQwl8UAP0qMTJvseOQolvPxiKAZg8Do3V GyfdkzomjGCOwXJe3Z0p73vqvOG5wTr+Rs9FtjBwUefnRH8r0wq4nfNTHB86TTR3 XqlYZWB3GDqcHe239JYKvzlaGB3zq4ErjUJJEIoOfCr7f6bkYiuKBPrygZ0oRFi0 vkxqbkgwdVLWzx8JkOyELAuDYo75rp7j87oFKYAMGT0uRpX/KXjaAHa0uG/fgOZ+ AWhARiLk9xE2dk+WV7Zq07V78rgCnGulWtamRRNiiaaljwDjaP+ruTIZNVJG31LW Lfas7Diws0ZzXdOHJ67m4hZ3LstCkZsogFPBaxcCEDrhPVYZHwSfrGYZfA3/CrdW Lypm4CChVR5eHMjtNVNNLofA0LcAZVb+N+XtFub8iuOi29tZebA= =pXB5 -----END PGP SIGNATURE----- --7tayz57lskrdvkiu-- From owner-freebsd-git@freebsd.org Wed Feb 10 20:19:12 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 464EB529AC4; Wed, 10 Feb 2021 20:19:12 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbWLl2M2qz3HDk; Wed, 10 Feb 2021 20:19:11 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x331.google.com with SMTP id o24so3020400wmh.5; Wed, 10 Feb 2021 12:19:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=ZSlep5BitnawrgQKfdKg14lx+ahqtaJPQ1wWxxXs5+s=; b=fTg+bonP8bSjsBBzA30dO31EFOVHxEHSDd+5QbfOH16vkgBlPYQBgJ8G7XbFePFZlK 9M2aND8giVwcFAK8zmcKapiMOybUHQFVbnLLSTrJxCnxC4S9SMaw13LffHt4Hj7tU8CZ ZhpMPTElZtCbnpFdk0TFwRLCA0YR2aRaE0OtGNBXpFgOus3To+YJuzuy2CYhdbYWQNvu oKpqHOSfpIn5Q7gYIypOdQXEcrBO/CyWwObhdfrydm9YXQCtEKhNYPrCW8a7d2ZmiOl2 xGM4K8/0Xclu/volJYVqUSzXjAp2yB2kuf50WY4CCPJzB8AMHbm03cBYqxbaRoG9jmuJ Q6sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=ZSlep5BitnawrgQKfdKg14lx+ahqtaJPQ1wWxxXs5+s=; b=XyWetKPTxVBSY5QbkvZxWcIYzG0ZXDZDcfITnLl8etNRIZGxCBlnhCKa2Mc8uyAnAp N/iLnPHZ0Wx9yXF4d/nR3UQiCXRjIeWdiDx3o+inx2WeSmaxKIFPCVXwOJM/fnvj08zh ZkbJdTnK8pdfleO+P1NkMxIv5fHRxNYpwNJ9yfas7MKTJJtGdJiml3Aex58WnXLv0YAj npi5P4jYblkTeAs1JxGNOTIxDaPm+TGV0LHVmRENO9xrkU6/N+cXa8XI6xMRJXos2Zin rDbIYkivmxyYJ/tp5kx0ayuR/0xyr6W/rhwN5g+cWX/POh3oW9UX6AOunhXZMVqxbwjQ uZoQ== X-Gm-Message-State: AOAM531Xo8WJl0RYTVVVD8JuTjKOrWU7uinLr9vEvm8HRrhN/AyOVcCi rFJlkpuxc2BY8iwUnJsvFFBLfTO0N29WG4JF X-Google-Smtp-Source: ABdhPJxcMc4n9vGfPBqe1avpYvKXkD8DPmXe5s5sg4QMajVeGKU49H1bRHzBhDR1jpTT0Vc3PFWw+w== X-Received: by 2002:a05:600c:4f14:: with SMTP id l20mr712086wmq.155.1612988349511; Wed, 10 Feb 2021 12:19:09 -0800 (PST) Received: from [192.168.1.13] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id q24sm3904151wmq.24.2021.02.10.12.19.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Feb 2021 12:19:09 -0800 (PST) Subject: Re: cgit: orientation To: "Rodney W. Grimes" , Warner Losh Cc: freebsd-current , freebsd-git References: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> From: Graham Perrin Message-ID: Date: Wed, 10 Feb 2021 20:19:08 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-Rspamd-Queue-Id: 4DbWLl2M2qz3HDk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=fTg+bonP; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::331 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; FROM_EQ_ENVFROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::331:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::331:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::331:from]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-current] 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, 10 Feb 2021 20:19:12 -0000 On 10/02/2021 15:46, Rodney W. Grimes wrote: >> On Tue, Feb 9, 2021 at 5:52 PM Warner Losh wrote: >> >>> >>> On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin >>> wrote: >>> >>>> Given this, for example: >>>> >>>> < >>>> https://cgit.freebsd.org/src/commit/?id=174a7e578a33c01401e33f9bfcc077fc3155251c&h=stable%2F12 > This link probably came from someone copying it out of the address bar > from some browswer, the better way to get a link out of a cgit page > is to copy it from the commit: hash line that looks like: > > commit 174a7e578a33c01401e33f9bfcc077fc3155251c (patch) > > Right click on the hash and select copy link location. > Thanks, I already tried that. Result: again, 'stable' in the URL and 'stable/12' visible in the page. (It was me who originally copied the URL, to demonstrate what can happen if someone else does so.) Please check my sanity. Is it true that this particular commit is _not_ in stable/12? From owner-freebsd-git@freebsd.org Wed Feb 10 21:53:17 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 4B36C52C204 for ; Wed, 10 Feb 2021 21:53:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbYRJ2d9Mz3NQQ for ; Wed, 10 Feb 2021 21:53:16 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1612993993; bh=PXjFUa0jOrDQRaCzynRYZty2WSfcB91pfHEFtOHywNO=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=FFiSEi37N7oPlYDfMgyLFCdErVTA1xcR57UmXe05dpQ327P9Qh+pGVxh8fYJdDiqVwVBuDwQSrCfRCSmvuMRQZDRZZzPrcvh+Cw5mmZ6BT9YzUoJ+FBFV3RfDEUPWqN5N8YWgw4j0F3tvay3K9jJb8bvQmnzBOk4Uc2BL7J3cwDseAnA0mRO0R73fw3NQ8QBipDxSsLl0sdHkEuEcXyNDy7PYM3XAR5/WMXpCGk2gYXgrH+SFuFi4HYdzSsbADUxu0Ralw3ntes5T1+g9tC8OnzruBeVbbOzMNxyaD9dvknldiG+NcbYBYae0RWfKhaRy3dxPR5RBtm993oUiIgN8A== X-YMail-OSG: PBkjdTQVM1k8pVDVu6UloeGW777rvdAKeWykzZUDGFdyF0vs3ux8wcS2j82agw5 jnIZHX6CbdZ36dcJwpxUB.M8YYGsdh2pe9TPHRDrxi0GW3QzbUHZjOqbsbNvfX9UJ_1gyfMAHMJ2 4xDvmaFhGQ5CtYBKuKDOpqbUC9GfDq4oj6qxIydRZTicmfCqlM4ElgWgxdufmTZc1k3s2bqHlNxI erQvkcX8yDox8X6vJSm9gKUMvg2k2EMLedseYilWp6gfmUHBCDtgxTnlv5AX9M7vP0XslKDFnXtl uVFUBQkRCUXcTrHT5oTvrEMrBWacBu4skusttC5HFmV9gdIXO26y52651R0FjPcipMJmUjaijqRD DuHJq70f_l8jVnGfmKelKnmWZEIf4T8Y.VjAB.ZWQhcQrZfPLNFmSCVR6dpoMF_Oabz8_vAedhD4 jaMDKMJVWonNCkpkB9G8WXBRhKnsiFsIWsWwgLGc1jAr1zwaciWpMGVD9UYu6z0lTXuFNKmsHW05 rcYu2vQ16gv_RlFGLS3CDeln1IdrRRKyAzdLeotdFWLuheaJQQHN6VwUuj8QL.1cCUMrZ8PTmzxk .GlzvIQxf3nIam6KcYT7J8aj5JU8GXCjRrZ3XwSIvR7d8hguMnmg9RVa7rTPdXY6GBajTzbRMnRR 8Xs5hUr0ONNe8hfkmjjS50IH9UCr6PdNOFbovOKnOPyF12LfXSuv6M.x28HvPmTGYoMWoop2BFkz pP0w9vuLMUpH57vGP0cPR1rQ05RWnMOEj226JQCiv4PwQpwZH_0iPh0k_bre15exK_LXNbe1obNP 5UTPqaL7CWwdXqeAxT8_oY0hS_B6olTAg51n_dO3z2HAUedm5NHMnByMlOYXeqRc5lnaB0TsqrYD fYAR653PbIj5Wbxhxc3p12gpRD.E1tE8YcCnLorAP8f.WspG6FYdkZVDHxZBgxV1eY56DqbzUDQG Re7e3kAM0zMD5dKQiO3mK13zi5izNHWxjxnGqHMMqNtRCLrqTszMqPOv2cCdQBUUo5rFlOM9l0Do dglu6S5w_F8VLVyaGVQiJlTDTlVQ1t0jBs3tzKt1Kxcyfhry6Q92GdwtnWJ0J_x2bJsR0znu6aRr slL5QgcCXpMFYMzJIg30bMaZoF0y9rduJL6cjkYS0MMsjxU5EE1GBGx1bBIOKrSu_vT0IAT2TSQe YfRIjUgi9vw8FO_W2q5Ce8UOqdK_n.b6sDSkIF6maFoa7x8AnBEAXGTGWbFoVD52VlzX9Vm0v89P rHtALS0gc6KVjRnqOqIXfBryW.BlYbsCSRNZ_ZxjbIuWiLP1n_C2lZIhpywODYPVhx3.fqCEjoZk IGKPg7h11qw53gC4y4SyXrdmETxeY7Qmx9p5hWLPx89lYhrD7W0EtdsvHE12GvBBxg.lZPXrUBSD OzeSHYFCJgTCgM4rIsky5vP2S6Bu2mQu.y0EKm_84_p3coT_1IBl8TPYB1_yoT.4RZZxJk8DCYCR ChlftqVyl3B2XtBBVLX07vQ7BGqWm25khFsApQCi_50Y0ThVqPq1_mxQ_y7_9b1fFdyGqQuSlKkn Z44tpfjxa_Tmvzj5RzApIOfAre66tN0U9m9AAhpY0PlYhKJIU55cnmGIjED.7twB45FlaxF8gAG0 UHVgmREbbuyPCI.5ccgoYUv4L5PA1ZSzLo1A_qCn5ZKeSnUM5gcm41.98yloRfWAlXRAJW20znqt wrzXh4jt73Y2_dIgdc.d4PVTrJ6Lo2iedgeFnE5HlPuu9JdAUNgxRNJdQNozP6lhRAYa8ldE_D43 PFCsIuCQbhA0VTdChd0qJzFSXgV001qcSiqjBGswKxPcous6CQUqKjRpfh68DySXwmG0pxq4lVMZ 76xSouZu5LeA3ooSyqvI22KzsP23LbD1a2lgLwSOl1pRZLgqmjPtIklThJXky0GHCbHKuRVbYtmu zS890CpBvl.D1IBwNd43UoFylMI4UtaRkL0lcWbtJllQ8uSlh18ToAY3xPGJXeKOnMZpZ2S_pceK F2DYI7GWMBMRNY0VUcE2xnp_S_._SsYCQMfk0tRdWScQXji_pWVghuQ4hXGBnQ.LSMoOgUscWKCK d2yzNJoWXlRSAEl0EkEqJFEc3H6becEIke.UGfNPxzGJpT_s3xP0KXXMHCOU62Vc2G4GoPoG_oY4 2lNORXBbe8C_2FZ9sfWqyBXvk_hV1_3PJESb1cqOBTqv4nLrvPLt.lONedLzGMc7cVu.D0IKwbNb p7p5Y6Mvic2imfmb7L7O6Yf4Vs.yaYPFrFylFvfryFwRhx75F_EJ0BU9eFpYvPFDTPciMWwm0PUk 8Dj5DuW9k4FhAz9w0orVOeGSi8CmXm97ArDL3BQHp9vMbFjopMQhvAfBjZ79O7vWIz_cZTevTr6O zNUBIN3nzXvHeAjMv4yPU8RObjHNfC6FK_Ks3XzsP_SmPYNRdu0rOI7uV2VKytCIfkZfDDvuVM8Q vtmlPw5nrjkdSNkcMWIbQUm4We_iCs8Ucq_rN1ItV_9YQXGzVNGM7N.Pp3pwPB8_S_ztrF4LM_vX FlrxzD_h14EWfMvj663RMSgtP6Cr9wwCSklZs6UeAS.7pwZSJ5Sz180dJwdhz0m4GUWhGXW0z5Yw rMSIa3Zv0aw.J3Ho56bwpnjaUne2bj0Y6yn5.Fd8GHbXIuzQS3ZWnrMqXQ4AiWUakDYG.JLrAnVf tjidlPsIl6aR61ybPWdWhKmN4gVkjc03uLoKoGZklPz_7G9vs7R8M X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Wed, 10 Feb 2021 21:53:13 +0000 Received: by smtp409.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 5045270946e58cb1c968863db8a4af8f; Wed, 10 Feb 2021 21:53:12 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: cgit: orientation From: Mark Millard In-Reply-To: Date: Wed, 10 Feb 2021 13:53:12 -0800 Cc: "Rodney W. Grimes" , Warner Losh , freebsd-current , freebsd-git Content-Transfer-Encoding: quoted-printable Message-Id: <5520B8DD-7A30-4DF9-A0EE-2EDD95422C1D@yahoo.com> References: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> To: Graham Perrin X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DbYRJ2d9Mz3NQQ X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.205:from]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.69.205:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.205:from]; 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: Wed, 10 Feb 2021 21:53:17 -0000 On 2021-Feb-10, at 12:19, Graham Perrin = wrote: > On 10/02/2021 15:46, Rodney W. Grimes wrote: >>> On Tue, Feb 9, 2021 at 5:52 PM Warner Losh = wrote: >>>=20 >>>>=20 >>>> On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin >>>> wrote: >>>>=20 >>>>> Given this, for example: >>>>>=20 >>>>> < >>>>> = https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc077fc= 3155251c&h=3Dstable%2F12 >> This link probably came from someone copying it out of the address = bar >> from some browswer, the better way to get a link out of a cgit page >> is to copy it from the commit: hash line that looks like: >>=20 >> commit 174a7e578a33c01401e33f9bfcc077fc3155251c (patch) >>=20 >> Right click on the hash and select copy link location. >>=20 > Thanks, I already tried that. Result: again, 'stable' in the URL and = 'stable/12' visible in the page. >=20 > (It was me who originally copied the URL, to demonstrate what can = happen if someone else does so.) >=20 > Please check my sanity. Is it true that this particular commit is = _not_ in stable/12? It is in main. My exploration was as follows but the general behavior is odd to me. Finding where the commit is from for sure . . . Using the id in a range search still says main and lists: Commit message (Expand) Author Age Files Lines * ZFS: fix assertions with INVARIANTS Alan Somers 45 hours = 1 -0/+2 * Revert "SO_RERROR indicates that receive buffer overflows should = be handled a... Alexander V. Chernikov 47 hours 21 -100/+35 * hid: bump HID_ITEM_MAXUSAGES to 8 Warner Losh 47 hours = 1 -1/+1 * Don't check compat.linux.emul_path before loading linux(4) = Edward Tomasz Napierala 47 hours 1 -1/+3 * acpi: limit the AMDI0020/AMDI0010 workaround to an option = Warner Losh 47 hours 2 -0/+4 * Turn off forgotten multipath debug messages Alexander V. = Chernikov 47 hours 1 -1/+0 Going to https://cgit.freebsd.org/src/log/?h=3Dstable/12 does not list = those. Going to https://cgit.freebsd.org/src/log/?h=3Dstable/13 does not list = those. Going to https://cgit.freebsd.org/src/log/ does list those. So: main. Exploring using search to find the commit . . . If one starts at: https://cgit.freebsd.org/src/ and does a rnage search for the id of a stable/12 commit the URL ends up being: = https://cgit.freebsd.org/src/log/?qt=3Drange&q=3D2ac71adb4026c4faade5ac824= c6a1b92e2504faf The upper right ends up showing main , not stable/12 . The commit message links also do not specify the branch, for example (copy/pasted): = https://cgit.freebsd.org/src/commit/?id=3D2ac71adb4026c4faade5ac824c6a1b92= e2504faf The next link is (copy/pasted): = https://cgit.freebsd.org/src/log/?qt=3Drange&q=3D2ac71adb4026c4faade5ac824= c6a1b92e2504faf&ofs=3D50 Using it again leaves main in the upper right. It appears that first going to = https://cgit.freebsd.org/src/log/?h=3Dstable/12 and using links there or using a stable/12 link that happens to be on the page for https://cgit.freebsd.org/src/ is required to get the branch tracking started --and you have to avoid operations like range search that drop that tracking (in what is explicitly displayed). Just having an id and trying to use it is insufficient context for cgit.freebsd.org to identify branches overall. (I do not claim that the "?h=3Dstable/12" notation is completely unique to the purpose. For example the original reports' "&h=3Dstable%2F12" can be generated. I'll ignore the variable notation generally, just showing what I did got as text.) I also explored some what URL's to a stable/12 commit would do = https://cgit.freebsd.org/src/commit/?h=3Dstable/12&id=3D2ac71adb4026c4faad= e5ac824c6a1b92e2504faf vs. = https://cgit.freebsd.org/src/commit/?id=3D2ac71adb4026c4faade5ac824c6a1b92= e2504faf The one without "?h=3Dstable/12&" indicates main in the upper right and copy/paste of the commit link shown also does *not* include "?h=3Dstable/12&" text. Further activity from there continues to not have the text. Of course, if one goes back through one of, say, https://cgit.freebsd.org/src/log/?h=3Dstable/12 or: https://cgit.freebsd.org/src/ one ends up in a context that supplies the "?h=3Dstable/12&". Repeating with the one that has "?h=3Dstable/12&" shows stable/12 in the upper right and copy/ptase of the commit link show does include "?h=3Dstable/12&" text. Further activity from there continues to have the text. Of course if one does a range search for the id, the context is lost. Summary: if you want do see what branch via cgit.freebsd.org use you have to use cgit.freebsd.org in very specific ways. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Wed Feb 10 15:46:30 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 0923D54A1B0; Wed, 10 Feb 2021 15:46:30 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbPJ516L1z4dXr; Wed, 10 Feb 2021 15:46:28 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 11AFkOZm060588; Wed, 10 Feb 2021 07:46:24 -0800 (PST) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: (from freebsd-rwg@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 11AFkOMO060587; Wed, 10 Feb 2021 07:46:24 -0800 (PST) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> Subject: Re: cgit: orientation In-Reply-To: To: Warner Losh Date: Wed, 10 Feb 2021 07:46:24 -0800 (PST) CC: Graham Perrin , freebsd-current , freebsd-git X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4DbPJ516L1z4dXr X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd-rwg@gndrsh.dnsmgr.net has no SPF policy when checking 69.59.192.140) smtp.mailfrom=freebsd-rwg@gndrsh.dnsmgr.net X-Spamd-Result: default: False [-2.10 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; RBL_DBL_DONT_QUERY_IPS(0.00)[69.59.192.140:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[69.59.192.140:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; 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:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-git]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org] X-Mailman-Approved-At: Thu, 11 Feb 2021 06:39:24 +0000 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, 10 Feb 2021 15:46:30 -0000 > On Tue, Feb 9, 2021 at 5:52 PM Warner Losh wrote: > > > > > > > On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin > > wrote: > > > >> Given this, for example: > >> > >> < > >> https://cgit.freebsd.org/src/commit/?id=174a7e578a33c01401e33f9bfcc077fc3155251c&h=stable%2F12 This link probably came from someone copying it out of the address bar from some browswer, the better way to get a link out of a cgit page is to copy it from the commit: hash line that looks like: commit 174a7e578a33c01401e33f9bfcc077fc3155251c (patch) Right click on the hash and select copy link location. > >> > > >> > >> ? with 'stable' in the URL and 'stable/12' visible in the page ? how > >> would a reader know that the commit was to main (not stable/12)? > >> > >> Is there scope to make improved use of cgit, or is this a limitation of > >> cgit? > >> > > > > There's a pulldown in the upper right corner that says 'stable/12' though > > it took me a while to find it as my eyes glided over it a couple of times. > > > > But that is due to the stable%2F12 in the URL... W/o it, it's no good. ^^ extra word? I think you meant to say "It is good". > Warner > > Warner > > > > > >> TIA > >> > >> _______________________________________________ > >> freebsd-git@freebsd.org mailing list > >> https://lists.freebsd.org/mailman/listinfo/freebsd-git > >> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > >> > > > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > > -- Rod Grimes rgrimes@freebsd.org From owner-freebsd-git@freebsd.org Thu Feb 11 07:10:30 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 E13FA53CB32 for ; Thu, 11 Feb 2021 07:10:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic307-54.consmr.mail.gq1.yahoo.com (sonic307-54.consmr.mail.gq1.yahoo.com [98.137.64.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DbnpF3JRNz4qTC for ; Thu, 11 Feb 2021 07:10:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1613027427; bh=uZav1xdcbKbt4aaGfvnrMTWpmb0mZc+STBQb02ZLRX/=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=UaVYtmvr/2QuT8mWZ4Me1JhEIeFm/ar6T8OsmpeWXzWZg0mRMrv2bFLToc7ZNeEeXTgIq4VZY2es7332t97rfzJQNVLHkzu0Q1qACJbylp8CP8flbuekuPUbr7dFcRQfg4ibJ8pmbQH7KqOAKfOZGOjZAOnQRowsIJv++TKtqHjNO4FS7IAi04RDBS8Y5vwrq/veWjaG3iBc+iux1xJ6mlkkcRcB1+j+7vJBbpbTq5WkwmMzBG/80af4gZo3m0uQ43ZDSf7CvK5cbmjQmhNMzG2P4u+C/TUd9mzbIaFCh1C4cGwAEuvyki9zF62o/g6AgXjejzUEqKR504N0SlTGHQ== X-YMail-OSG: WFbbJIIVM1kGNZK_hOXyalnbq89g430nh2QuJU9T9OvS0TDqjxv3Ij1ZBS2y1X0 7eB5giDYyGngLuX_dQ4_WMEZNhoFqtAne3hI3I.BhaIp1CmIxA7glk3PcYb74zoJgQbEDt8Z6Lfv pqNHgD8WELIGdpx7y9YpKOWDbz_phEKEXjImsLO77zPOf5ESnXjXn9bIO5i.oEnSsCzDVZhmtHjq LZBcdE811Vo9rEP520MpMhHxizKmv2WGuXSQ5V29.ce1KS2yIsZShbidMwgy5Ez34k94IeDvKDV8 8VzZpfzB2aDw.gVHq0pup.zNShNjFjtpBmhzUA7pyun1Cjcnrj.4H2j8ctkDsJ2nH79gTTh.nTyu 13Ag_d8ENTPujWd8yIUKg.z8PKEYpYae0EALqVO8doUS9NqHaFX8a2ywLUiqWobOUROPqjY0lqE_ KtL4uEuOCzA9u43RH23PtZkJ5zc_lPoxcoiyg0gtUS93EILw4pqka_p2gjgmbv15X_AFDX1HdjkD VFF7TAIo1QsZNgU3oiM8kMRSKlYukL5OFP6OMg68naPzC2p911CO3faEaakte0Hx.8VqQsZUHQhz hWUEnsHxzQ3GSfJRn.y1yJAE5g6ff15RUUyIb.K02t9JGJtuAp07kcoaQZPK8U0mRYgnQ1GOVdRU 9z1sSEvTCwtLzYIOvhS4_NUwzqJJJpKFlNC8MyoAsboqpmfjKO5TZ3pm4tUJDct8tgsWJN0jExax Mk1eQkgw9B3nfovijOqpifUW8U_Zb_ed5jqLQiAvSFITVyXzpkE8fQuhqzM6Rlw_vXBlaNqD4aTP FJ6LigZPdVYekFesjw7gEHv3aI.9Z127MKIRApEtkHWK419cYTWz4d8KlZDRw2I3wYCoDzwkT.eH w.OZt2P.YGsYXH21Yr.A25rbbME.T8MgeylPeB1ru33MJ4zTlwP0gpo43_GJLTGo2VYoHOwNQ.VA 49aip5ETjzBot7kvdUqVU7PUj1VFRUI02LtmAwNI7TeV5f3YeuWmMEKZFH.BFAHTuA8cZHmzDsdj mW2MKRx33.td2PanvqI9hmyM_u4L_WQJPWhqVCCS.K4tPDvYot756.SZTsfDn6HdJZybAQ_juy_g _SHoM.1AD4_EB1bsfkAPVW2aSdcAG8MIQVqNxxepguvFLXFCc2FgPRjSoFrfEEebNN22ShtIj0_b 4rJgr3fXFukt7RyI1tBlHOC19dK9dTbpJtA9juc73k_DePP1x3zjs7hHeOGHfFC5IO0fknlOyLsl rg8ud6liPFMh9YN81ToP6l_ZLZaxxEP0pbw2EoO1scyX53yn7mludU2quyfH4J39zlNs_tS.n49U g72WpyFwbDsl_1b3FEaDZH2ecfMEGQ1fvH6J8EfVDqez2wezub_loH7UTIQe5yQm08H_GhJRyDOQ a8ZO2V.lWLQKIle17mt8iJERvv534pWKS1h8heO5ocw_aaJCfxzFLy.wErKoB72DTTds0g_uJHe7 AoZw.j7AlkFwweM_EqQ8E158ynf8cJDqHPcWKTyvPej7Pn5HZNGBYgayxlaCyYCzPESFVdiF6HAn NVvx7hUYEjUzoXea9LwbtnjPmoBNEF9bwW0O_LWsLk_zlsbiBatV1IyuLuy00kcRDMj7z4dycpMt dNQpekhG4fRxV6jxXwpENF3i2XwxnwA20tjhoPY8PFJQjrQ9KZxNUj4kCx1t7hPdQDrvnh_Tt5tr FAVrx1G4q8JeFFxAhGTvXX9X7uUDd6JGKLlYQ7tpq26SlixOKR.YgFMUPHg4OsT4ObMT1hgi5A.X L4tnIZrCPvO_F5Uqfj7wzQEgpv75D0VB_TNtE_WxECKSjpUN2KKDTT4JhTRwoMwnFFPfiKRtHW9s BJllgAsTAfdpahczlzqQL219fb7W49jSGbHQw05_u2C556E82Faw3kMNS09RV79xv3SuUBfgH6Jh zOdiztdGCc4BkkrXWxRoIL9MxXShoWNS1e2P58yHRF6yvxaBxOsamGcnwmaFIE4Q4MpUUoKMJ7hf ZZ_h_EDksfxuMkrrvgfC3YkHtAS6Sf3yQnFh4q...iGKdQLvbOD3kjlVfqLA7S7T9vO87at2gxxj 6T6PUTwNj8.d7C0ElFxjTLKBklH77gysdFaFExqCMUcQXBAC6_mBnjTRGnbzmk8HErYy02DPCzN. 3EZ.a9kB_ubjjS.ZYpod8kTWp1ayEDCkrurPLTE5CiGznDvDHnImZJF6MSdRi11VTv8xMeNa3vvC HAJw_7mmXkRSmucIvBj2AC3e9fQmLerP1n1_tDtRKh2rCRnG7r8t6mtmnNGgBI2q1Q7vGgbf57jp ORXwaqOcLEhw8EcBsLcGAluFa82qQy2_CmPTFLj3pT5M4P4SNdooIAvRqedgn0u8xfuMUuwscllz vl4p1JputOaaNerycm71gpsBUgSlUM9IlHpGVXfNl0YN8icqnEQESsRi9nhVoF3Yp5rbGGh8oMqT UADdoXq4RFs3KQg7PD8SziZdOOJkSLo1Ec305ZCZiO7ARlsYmq1MH3pbFDLJpROdQHTpQtfwxlT2 OV55_bGNiwvrIKwcAJi7WDxARxVB17ulKqznZNAT0qJkC64PA1c9N49UKMrR3Lj3zZmll8VJ31XI KuJg8VOWpHVpcpG8XJNaZAbzPi.y6ILgNnkA_ X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.gq1.yahoo.com with HTTP; Thu, 11 Feb 2021 07:10:27 +0000 Received: by smtp403.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID d5d8a9359b01ea773499ee40f11ecf8e; Thu, 11 Feb 2021 07:10:26 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: cgit: orientation From: Mark Millard In-Reply-To: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> Date: Wed, 10 Feb 2021 23:10:25 -0800 Cc: Warner Losh , freebsd-git , freebsd-current Content-Transfer-Encoding: quoted-printable Message-Id: References: <202102101546.11AFkOMO060587@gndrsh.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DbnpF3JRNz4qTC X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.42 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-0.92)[-0.922]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.64.30:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.64.30:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.30:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.30:from]; 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: Thu, 11 Feb 2021 07:10:30 -0000 > On 2021-Feb-10, at 07:46, Rodney W. Grimes wrote: >=20 >> On Tue, Feb 9, 2021 at 5:52 PM Warner Losh wrote: >>=20 >>>=20 >>>=20 >>> On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin = >>> wrote: >>>=20 >>>> Given this, for example: >>>>=20 >>>> < >>>> = https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc077fc= 3155251c&h=3Dstable%2F12 >=20 > This link probably came from someone copying it out of the address bar > from some browswer, the better way to get a link out of a cgit page > is to copy it from the commit: hash line that looks like: >=20 > commit 174a7e578a33c01401e33f9bfcc077fc3155251c (patch) >=20 > Right click on the hash and select copy link location. Unfortunately, it turns out to not be that simple. For example, starting from the page for: https://cgit.freebsd.org/src/ Try a range search for: 2ac71adb4026c4faade5ac824c6a1b92e2504faf (which is from stable/12). Then click on the link in the line on the resultant page: * readelf: decode LA48 and ASG_DISABLE feature flags Ed Maste = 28 hours 1 -0/+2 Then copy the link in the line of the type that you reference: commit 2ac71adb4026c4faade5ac824c6a1b92e2504faf (patch) Result? No indication of which branch: = https://cgit.freebsd.org/src/commit/?id=3D2ac71adb4026c4faade5ac824c6a1b92= e2504faf Using the link does not change anything for what is shown in the upper right. All the steps reported "main" in the upper right. What happens depends on which path through got you to that point. Some places do generate URLs that have branch references. Other places do not. Some places preserve branch references in a URL. But some activities do not. >>>>>=20 >>>>=20 >>>> ? with 'stable' in the URL and 'stable/12' visible in the page ? = how >>>> would a reader know that the commit was to main (not stable/12)? >>>>=20 >>>> Is there scope to make improved use of cgit, or is this a = limitation of >>>> cgit? >>>>=20 >>>=20 >>> There's a pulldown in the upper right corner that says 'stable/12' = though >>> it took me a while to find it as my eyes glided over it a couple of = times. >>>=20 >>=20 >> But that is due to the stable%2F12 in the URL... W/o it, it's no = good. > ^^ = extra word? > I think you meant to say "It is good". I expect Warner was referring to with "no good" was it saying "main" in the upper right when what was being looked at was from stable/12 after it was branched (or some other such mis-matched example) and that he was indicating that the mismatches are misleading, especially if one does not know to expect them. Part of the issue is that nothing else on the commit page indicates which branch(es) the commit is on, so it is easy to read too much into the only branch name shown. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Thu Feb 11 10:24: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 85494542942; Thu, 11 Feb 2021 10:24:24 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from lb2-smtp-cloud7.xs4all.net (lb2-smtp-cloud7.xs4all.net [194.109.24.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.xs4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dbt600PYbz3JQk; Thu, 11 Feb 2021 10:24:23 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from cust-d4a83f22 ([IPv6:fc0c:c11d:cecc:f58a:eaa1:c0:9d8f:c143]) by smtp-cloud7.xs4all.net with ESMTPA id A992lO5Qz5126A993lItyn; Thu, 11 Feb 2021 11:24:22 +0100 From: Adriaan de Groot To: Graham Perrin , freebsd-git@freebsd.org Cc: freebsd-current , freebsd-git Subject: Re: cgit: orientation Date: Thu, 11 Feb 2021 11:24:16 +0100 Message-ID: <2285106.THHZn3L5Ee@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3780568.kAAoriTUSa"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4xfJ63HpeN0lI7GKrk6BzFQI8QWpbOns00DRG+Rri4e+4wp6yUfEN2i7Cdqkb9pQJU36qB7p7UIepNPDz4Dkmf9A7Zg/fYhAZkr7lIrdcWABevTKPyOjN0 A8wy8EYLDabouBQcbS5YGzmgHI//sui/X5LIAnyRub+9Zf/Kydw0duP6uLSvpcl4rUIdlJQLg5wazrZDoBAbzqAlca289k0eEkCeHPUKHxpL9Yf+qHsh/wA7 8M2fWjrpjpXg/mSiI9KJdcEf7e8sIwpf0ZWruB2hCte7aiC+rFPUb+Vt2DIO8SZkOff4PglZolCRras4Nwv/vZilo627XLMx9ElCW3j0RG/stSuM4KtjeAcy OhPWz8Z3tGFXne+OyZQrKDqw3FAXJw== X-Rspamd-Queue-Id: 4Dbt600PYbz3JQk X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL]; 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: Thu, 11 Feb 2021 10:24:24 -0000 --nextPart3780568.kAAoriTUSa Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Adriaan de Groot To: Graham Perrin , freebsd-git@freebsd.org Cc: freebsd-current , freebsd-git Subject: Re: cgit: orientation Date: Thu, 11 Feb 2021 11:24:16 +0100 Message-ID: <2285106.THHZn3L5Ee@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: References: On Wednesday, 10 February 2021 01:52:32 CET Warner Losh wrote: > On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin wro= te: > > Given this, for example: > >=20 > > < > > https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc07= 7fc31 > > 55251c&h=3Dstable%2F12 > >=20 > >=20 > > =E2=80=93 with 'stable' in the URL and 'stable/12' visible in the page = =E2=80=93 how > > would a reader know that the commit was to main (not stable/12)? > >=20 > > Is there scope to make improved use of cgit, or is this a limitation of > > cgit? >=20 > There's a pulldown in the upper right corner that says 'stable/12' though > it took me a while to find it as my eyes glided over it a couple of times. cgit, though, is just not a very featureful history browser. It does the ba= re=20 minimum, but phabricator or gitlab give you a much nicer (although in their= =20 own way slow and/or clunky) history view. Call me old-school, but =2D if you're asking this kind of question, you probably have a checkout al= ready =2D if you have a checkout, you probably have git(1) installed,. too =2D just use the command-line: git branch --contains 174a7e578a git branch -r --contains 174a7e578a The latter tells you what branches all have the named commit in their=20 ancestry. You could add a git alias: git config --global alias.what-branch "branch -r --contains" and then you can do git what-branch 174a7e578a Buut, yeah, cgit. If you happen to hit a commit at the tip of a branch,=20 there's some decoration but the combination of id and branch in the URL can= be=20 complete nonsense, e.g. https://cgit.freebsd.org/src/commit/? id=3Da7c68340584c942792188ad50593d4ef15cc8982&h=3Dreleng%2F5.5 will give you Warner's latest ACPI commit for EPYC, from which you can=20 conclude it was in 5.5-RELEASE :| [ade] --nextPart3780568.kAAoriTUSa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEhrjttu2OP5apuuy1z93JbxKxkVwFAmAlBdAACgkQz93JbxKx kVzCyAv9HxSFaX3O4hd5eYXo6jFCN4N0Ts7sIwoyekaiHOEfJZSk6r81Ligavu3Z JyzcRzgPW694Y53CeuR2StvBdCAEwsbPeuHS0+to9DYPSEqai+xFVbxQ6rmAK0jB ON3hhM5bXQogOJtuqoUdqKk8mrf+ZmwogJ01v1I+I/jY9Yc4aS0930Z1RFFDgVBh r6l0pSscw5Nmr+pRA9nfwtXghvqvJNJaBsOkmqqwAeXjYo3JJC2Xyq9cgKaznrz7 QQyxXJKuJiw5rwPsQ+oqxAdK1VOH4BQgPTYpVJsy2Hx6ZMRLl/8fmWmGaBYEKK3y aIUa0nTsEyKZYy0bh+pZHdw/XRpNJ6zm09l0cJLwwB/Q2uq1ALN0xU1sZGSJUZty lUCglein0Wne8ILomJ8aWC3s8nDyJ0dTMv11jCpsVojWNz9ryIfkn8oR6lG+2X1E EPA3QhwNEBLUM+DKDX1gWGiOrrw2Q9BQ0cu6Z+JRnJun7ft0+qKv/CfYxMsFCjSq leO+iROz =2V5B -----END PGP SIGNATURE----- --nextPart3780568.kAAoriTUSa--