From owner-freebsd-git@freebsd.org Sun Oct 4 17:49:17 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6465E42E1C0 for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4B7K1S5Gz41Tk for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 31D9642E623; Sun, 4 Oct 2020 17:49:17 +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 31A4F42E1BF for ; Sun, 4 Oct 2020 17:49:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4B7J35Zzz41W8; Sun, 4 Oct 2020 17:49:16 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f170.google.com with SMTP id l16so5789567ilt.13; Sun, 04 Oct 2020 10:49:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fSO06qfmtrtkhmTWv2dsSAS1yX6EeVYF1aRIowns5V8=; b=mR4tp78ghMb5KGxbFWlkCpZYHG3Om8y/kuxq6LdL6stp7/8VEd+u5O098+oTIQKM4j CuOFWTFm+ece/JGNgM9s0w65cFTwnrq7v87JbwGzCskWseHfgT1E52NoAyxEH2iNYcm4 WJZmlEGT7urDHgtkFeDCVcxCWLBhvZO6EU9EDzRErykFdhNliXRnuynptkVDx/DzeUyE 2h4Pi+v0i5GUer6Evf/mFNryIR3UVbrALf3F5oIsVULeEgEjK9kCqU3C91Eoda9ul72u HvEGygIX97/AMG8316zVRgYh27+5wpuLtzRq3yGIu6z3AFDSvuPx5ewkp7tD0QImSmdY GlHg== X-Gm-Message-State: AOAM5302eUZrWDUz0ClPmfrxasbxVVHSP78Wp1kU42tIwzfOAQVwQMoX nXV7z9dmPRpViTQtwhP+fHInOvyB1rbWCJS6gtk= X-Google-Smtp-Source: ABdhPJxGV00TFK/cWh+S2UzRsozSttNjH7vb+ccBSYAJpLtQ0cJ/ChPNpdnW9pQ6hnKu2UagyTMgOPpfdWUZ0EXRLKY= X-Received: by 2002:a92:d742:: with SMTP id e2mr8373645ilq.11.1601833755069; Sun, 04 Oct 2020 10:49:15 -0700 (PDT) MIME-Version: 1.0 References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> In-Reply-To: <20201003223531.GA77534@albert.catwhisker.org> From: Ed Maste Date: Sun, 4 Oct 2020 13:49:03 -0400 Message-ID: Subject: Re: Question on (my) workflow migration svn -> git To: David Wolfskill Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4C4B7J35Zzz41W8 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.170 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.09 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.990]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.15)[-0.153]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.170:from]; NEURAL_HAM_MEDIUM(-0.95)[-0.952]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.170:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[git]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2020 17:49:17 -0000 On Sat, 3 Oct 2020 at 18:35, David Wolfskill wrote: > > As noted earlier, that seems to have worked. However, subsequent to > your "Heads up: beta git repo hashes changing this weekend" notice, I > attempted a "git fetch" within that bare repo, and -- as I ratehr > expected, git was ... singularly unhappy about the exercise.' Indeed. Let me reiterate though that this is a consequence of fine-tuning the conversion process; once the migration is complete it should not happen again. Deleting and cloning again from scratch is a reasonable way to interact with the repository during this stage. > That is not waht I'm trying to do. I am trying to have a (separate) > working copy (for each branch I use) that persists from day to day, and > which I update from the repo shortly before I rebuild FreeBSD. For the time being I think that you'd want to remove the bare repo and worktrees, and recreate everything from scratch over a hash change. From owner-freebsd-git@freebsd.org Sun Oct 4 18:03:44 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 537EC42EAE7 for ; Sun, 4 Oct 2020 18:03:44 +0000 (UTC) (envelope-from david@catwhisker.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 4C4BRz6yZRz4263 for ; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id EEDF442E8B6; Sun, 4 Oct 2020 18:03:43 +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 EEA3242E8B4 for ; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4BRz4N7fz421V; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 094I3gos001807; Sun, 4 Oct 2020 18:03:42 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 094I3gZE001806; Sun, 4 Oct 2020 11:03:42 -0700 (PDT) (envelope-from david) Date: Sun, 4 Oct 2020 11:03:42 -0700 From: David Wolfskill To: Ed Maste Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20201004180342.GB1349@albert.catwhisker.org> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eAbsdosE1cNLO4uF" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4C4BRz4N7fz421V X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2020 18:03:44 -0000 --eAbsdosE1cNLO4uF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 04, 2020 at 01:49:03PM -0400, Ed Maste wrote: > ... > Indeed. Let me reiterate though that this is a consequence of > fine-tuning the conversion process; once the migration is complete it > should not happen again. Sure -- and I (at least half-)expected that: I am experimenting, so at this stage, I expect a loty of stuff to be tried and tossed. > Deleting and cloning again from scratch is a reasonable way to > interact with the repository during this stage. >=20 > > That is not waht I'm trying to do. I am trying to have a (separate) > > working copy (for each branch I use) that persists from day to day, and > > which I update from the repo shortly before I rebuild FreeBSD. >=20 > For the time being I think that you'd want to remove the bare repo and > worktrees, and recreate everything from scratch over a hash change. And that part's fine. Where I'm having a problem is for the (usual) case of "no hash change", but there have been commits to the source-of-truth: it appears that "git fetch --all" copies those to my local private mirror, but I don't see how to get my "worktree" updated. Thanks. Peace, david --=20 David H. Wolfskill david@catwhisker.org Donald Trump is just in it for the publicity (well, and the money). See http://www.catwhisker.org/~david/publickey.gpg for my public key. --eAbsdosE1cNLO4uF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl96Dn1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 Pckirgf/dJ1TTQTn0BJQEfvP0qwi1oIUawBaTY3R922SllVHy9GkcFye1RFRFtpN EOmca/IFw+a+L48d3o9m/oc0CRfsWvNnbALvjzQJuBRBuiYiuoFqHcxyQjnWMdqa dpMoyEJemqHoPfU097tJHUeiF5G8X4qVWGlhTga6mQh1kVypbagK3y8jMomdUSPu 8WLQqCWWcW4p+I1ftJSlgqVAVcp9IY1yy2xdyqN+0JYJA/AhKIed6tAccPP3C+qw qvJIT4pJmLxRmN4NSYfNEC99MlLTe2CTmELbHjvyDfMXyMgIMBxfxxw/DzKB3EPg 40ekrIYCsONK03jdsKHA+cn8KOZXig== =8asa -----END PGP SIGNATURE----- --eAbsdosE1cNLO4uF-- From owner-freebsd-git@freebsd.org Mon Oct 5 15:03:21 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 401E2426D3E for ; Mon, 5 Oct 2020 15:03:21 +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 4C4kPP136Qz4253 for ; Mon, 5 Oct 2020 15:03:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 23C25426D3D; Mon, 5 Oct 2020 15:03:21 +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 23864427104 for ; Mon, 5 Oct 2020 15:03:21 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4kPN5DKyz41m9; Mon, 5 Oct 2020 15:03:20 +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.15.2/8.15.2) with ESMTPS id 095F3CM7022081 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 5 Oct 2020 17:03:12 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Mon, 5 Oct 2020 17:03:12 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: David Wolfskill Cc: Ed Maste , git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20201005150312.GQ92039@acme.spoerlein.net> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> <20201004180342.GB1349@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201004180342.GB1349@albert.catwhisker.org> User-Agent: Mutt/1.14.6 (2020-07-11) X-Rspamd-Queue-Id: 4C4kPN5DKyz41m9 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 15:03:21 -0000 On Sun, 2020-10-04 at 11:03:42 -0700, David Wolfskill wrote: > On Sun, Oct 04, 2020 at 01:49:03PM -0400, Ed Maste wrote: > > ... > > Indeed. Let me reiterate though that this is a consequence of > > fine-tuning the conversion process; once the migration is complete it > > should not happen again. > > Sure -- and I (at least half-)expected that: I am experimenting, so at > this stage, I expect a loty of stuff to be tried and tossed. David, I'm not sure what "unhappiness" you were referring to. I just updated the bare repo from my stable_12 worktree that I've created last time. Yes, it downloads a lot (about 1GiB), but that is due to the hashes changing. Now what happens is that you cannot just `pull` that in, due to not really having a shared ancestor (or rather, it is way too far behind). What I tried: % cd /tmp/stable_12 % git fetch # takes some time, downloads 1GiB ... Receiving objects: 100% (2734600/2734600), 1.04 GiB | 2.90 MiB/s, done. Resolving deltas: 100% (2119516/2119516), completed with 368 local objects. >From https://cgit-beta.freebsd.org/src * branch HEAD -> FETCH_HEAD This is a bit worrying, as it did not update any of the refs, so it's borderline useless. A `git pull` instead of fetch will spew out a grant massive diff though and churn like mad. ^C ^C So we need to properly update our "upstream" bare repo first: % cd /tmp/src.git % git fetch -pP That downloads everything again, which isn't surprising as it doesn't know about all the other refs that were already fetched, and also because the server offers that all in 1 giant packfile and I guess it doesn't re-compress and encode things on the fly :/ Turns out that refuses to clobber existing tags, so I run it again with --force. Still no luck with refs, turns out this wasn't a --mirror clone, so I add `mirror = true` and `fetch = +refs/*:refs/*` under its remote section. % git fetch --force --all ... aaahh, that finally gets me all the refs into a proper mirror bare repo. Back to stable/12 workspace and force a checkout to stable/12, even though due to hash re-spinning it is something "totally" unrelated. % cd /tmp/stable_12 % git status # will list how we are so, so different from what is now # stable/12 in our local upstream bare repo that we share # refs with % git reset --hard stable/12 # yolo, get us stable/12 no matter what # we have to throw away So there you have it. No need to throw away your existing bare repo, but starting out with a --mirror clone would've made things easier. Then you need to keep in mind git never wants to throw away any diffs you might have, and we might get 1 or 2 more massive "diffs" due to different hashes till the final switch over date. As you want a read-only mirror/checkout of this, you can just forcefully `reset --hard` the workspace to whatever git hash or reference you fancy. > > Deleting and cloning again from scratch is a reasonable way to > > interact with the repository during this stage. > > > > > That is not waht I'm trying to do. I am trying to have a (separate) > > > working copy (for each branch I use) that persists from day to day, and > > > which I update from the repo shortly before I rebuild FreeBSD. > > > > For the time being I think that you'd want to remove the bare repo and > > worktrees, and recreate everything from scratch over a hash change. Not really required, but you need to understand the data model to be able to dig your clone out of that mess. > And that part's fine. > > Where I'm having a problem is for the (usual) case of "no hash change", > but there have been commits to the source-of-truth: it appears that "git > fetch --all" copies those to my local private mirror, but I don't see > how to get my "worktree" updated. In your stable_12 workspace, you should be able to do this normally with `git pull origin stable/12`, but that is a) not going to work while we respin hashes and b) overkill, as you don't even want any of the safeguards. So in short: - in your bare --mirror clone: git fetch (--force) - in your workspace: git reset --hard stable/12 This is not expected to make sense Uli From owner-freebsd-git@freebsd.org Mon Oct 5 15:34:05 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDA49427AB7 for ; Mon, 5 Oct 2020 15:34:05 +0000 (UTC) (envelope-from david@catwhisker.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 4C4l4s36hKz433R for ; Mon, 5 Oct 2020 15:34:05 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 693FB427AB5; Mon, 5 Oct 2020 15:34:05 +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 6907A42777E for ; Mon, 5 Oct 2020 15:34:05 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4l4r5Mvbz43KK; Mon, 5 Oct 2020 15:34:04 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 095FY2F8014983; Mon, 5 Oct 2020 15:34:02 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 095FY2n5014982; Mon, 5 Oct 2020 08:34:02 -0700 (PDT) (envelope-from david) Date: Mon, 5 Oct 2020 08:34:02 -0700 From: David Wolfskill To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: Ed Maste , git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20201005153402.GA1349@albert.catwhisker.org> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> <20201004180342.GB1349@albert.catwhisker.org> <20201005150312.GQ92039@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ofekNuVaYCKmvJ0U" Content-Disposition: inline In-Reply-To: <20201005150312.GQ92039@acme.spoerlein.net> X-Rspamd-Queue-Id: 4C4l4r5Mvbz43KK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 15:34:05 -0000 --ofekNuVaYCKmvJ0U Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 05, 2020 at 05:03:12PM +0200, Ulrich Sp=F6rlein wrote: > ... > > Sure -- and I (at least half-)expected that: I am experimenting, so at > > this stage, I expect a loty of stuff to be tried and tossed. >=20 > David, I'm not sure what "unhappiness" you were referring to. I just > updated the bare repo from my stable_12 worktree that I've created last > time. Unfortunately, I failed to run it within script(1), so I don't have a record, but the attempt to fetch (on the "bare" (but not "mirror") repo failed. As noted, when I re-created the repo, I created it as a "mirror"... which (based on your comments beliw) appears to have been a fairly reasonable thing to do. :-) > ... > What I tried: >=20 > % cd /tmp/stable_12 > % git fetch # takes some time, downloads 1GiB ... > Receiving objects: 100% (2734600/2734600), 1.04 GiB | 2.90 MiB/s, done. > Resolving deltas: 100% (2119516/2119516), completed with 368 local object= s. > From https://cgit-beta.freebsd.org/src > * branch HEAD -> FETCH_HEAD >=20 > This is a bit worrying, as it did not update any of the refs, so it's > borderline useless. A `git pull` instead of fetch will spew out a grant > massive diff though and churn like mad. ^C ^C >=20 > So we need to properly update our "upstream" bare repo first: > % cd /tmp/src.git > % git fetch -pP >=20 > That downloads everything again, which isn't surprising as it doesn't > know about all the other refs that were already fetched, and also > because the server offers that all in 1 giant packfile and I guess it > doesn't re-compress and encode things on the fly :/ >=20 > Turns out that refuses to clobber existing tags, so I run it again with > --force. Still no luck with refs, turns out this wasn't a --mirror > clone, so I add `mirror =3D true` and `fetch =3D +refs/*:refs/*` under its > remote section. Aye; I had noted the parts (from "git help clone") about how "--mirror" handles all branches and refs, and figured that would be a Good Thing for my use case. > % git fetch --force --all > ... > aaahh, that finally gets me all the refs into a proper mirror bare repo. :-) So far (2 out of 2 tries, so take it with a "grain of salt") mere "git fetch --all" seems to be adequate for the mirror repo. > Back to stable/12 workspace and force a checkout to stable/12, even > though due to hash re-spinning it is something "totally" unrelated. >=20 > % cd /tmp/stable_12 > % git status # will list how we are so, so different from what is now > # stable/12 in our local upstream bare repo that we share > # refs with > % git reset --hard stable/12 # yolo, get us stable/12 no matter what > # we have to throw away In practice, I find that I do not need to specify the target branch -- just "git reset --hard" appears to be adequate. > So there you have it. No need to throw away your existing bare repo, but > starting out with a --mirror clone would've made things easier. So I am seeing. So it's good that this is documented, after a fashion. > Then you need to keep in mind git never wants to throw away any diffs > you might have, and we might get 1 or 2 more massive "diffs" due to > different hashes till the final switch over date. Aye. For now, I'll: * Continue using svn for actually updating the sources I use to keep my systems up-to-date. * Experiment with setting something up to update my local private git mirror repo on a daily basis, as well. * Start running some comparisonsa -- and, with luck, build some confidence that the use of git may work for me. > As you want a read-only mirror/checkout of this, you can just forcefully > `reset --hard` the workspace to whatever git hash or reference you > fancy. Well, the mirror repo is read-only. I do mess with the working copy (e.g. for experimenting with patches after I've reported an issue). I also rely on having mt kernel config file represented in the source tree by a symlink to a different hierachy of files under separate revision control, so that could also prove to become "interesting." >=20 > > > Deleting and cloning again from scratch is a reasonable way to > > > interact with the repository during this stage. > > ... > > > For the time being I think that you'd want to remove the bare repo and > > > worktrees, and recreate everything from scratch over a hash change. >=20 > Not really required, but you need to understand the data model to be > able to dig your clone out of that mess. Fair, but given that it was a "scratch" repo anyway, blowing the old one away and re-creating (as a real "mirror") appears to have worked well in this case. > > And that part's fine. > >=20 > > Where I'm having a problem is for the (usual) case of "no hash change", > > but there have been commits to the source-of-truth: it appears that "git > > fetch --all" copies those to my local private mirror, but I don't see > > how to get my "worktree" updated. >=20 > In your stable_12 workspace, you should be able to do this normally with > `git pull origin stable/12`, but that is a) not going to work while we > respin hashes and b) overkill, as you don't even want any of the > safeguards. So in short: >=20 > - in your bare --mirror clone: git fetch (--force) Aye. > - in your workspace: git reset --hard stable/12 Aye (though as noted above, the target branch appears to be superfluous). > This is not expected to make sense That is actually a fairly large relief to see.... :-} > Uli Thanks again -- I think we're actually closing in on a solution (for my case). Peace, david --=20 David H. Wolfskill david@catwhisker.org "the end of the pandemic is in sight" -- Donald Trump (while infected with SARS-COV-2) See http://www.catwhisker.org/~david/publickey.gpg for my public key. --ofekNuVaYCKmvJ0U Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl97POpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmVrwf9G8ahOLaHUXxJjl9gH9GZ2XXjLjDNPJfaWq+3V7tQASJOSl31+wL0REG1 ah1oizPlVGh1ZtBPz0I46sD73oVgy2qKXHroSsVZei5Ka/Sj630ZygbTnInhEEIO oCZSH4iJ5y/zQOic0lApIo87C22tIEe7e9c9lrk+gD8SAeTFfza4/ngkq/SGenD0 lVs8xC91ni7SEqEaQFwq5Pn1ZkspKr7WjcgSEeMVVzptCAsFXyOI0hBsS2zeMN1+ iXFgAOeDEp1/G9ki+oloPDY4wVGcyNdX3Rm+V77zLDPVU67gk1io4RwuojuFNxU+ gd57eCuSHaqzwzHDsRgap2aRSxMtTg== =oF9f -----END PGP SIGNATURE----- --ofekNuVaYCKmvJ0U-- From owner-freebsd-git@freebsd.org Mon Oct 5 16:11:56 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 464BD428B6C for ; Mon, 5 Oct 2020 16:11:56 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 4C4lwW3lhlz45X4 for ; Mon, 5 Oct 2020 16:11:55 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x734.google.com with SMTP id w12so12555617qki.6 for ; Mon, 05 Oct 2020 09:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:subject:message-id:mime-version:content-disposition; bh=vQ3FxT/zcTaC14rSiCYXeu0l56+p/Yn2uLhOSYXJuqI=; b=iIcBdo3bflC5KpZRzu/u/abS8dr9KTnZrjD3aVqSJCejrSbj8cT17KLUdi9quTckPD 9rTHhi2i3TrfQ8Ge81RMkxQ484FclZXFpAri5dsgFkhUFjJ3jqgPIf/a9v8fAB3I7fBx wJ2P5fJxeIpiGzsO8b6Ti75FGikFRvZMnD9G8T3KolnNGUbADRmrjgggbacyx3nKMe0y cvQwEozUSC5EjVDMp4GHdmD06KS9MBbXzGmLBQagXljAKeldOCUwCz7g5v9OCqYkJibS BVX34MU/Tnr9V+tepqFGB3U7DJrVk5l5r4Lfk9CDRdGVaAyN77IJS04Yfe+GMbk3sFuS AmnA== 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:subject:message-id:mime-version :content-disposition; bh=vQ3FxT/zcTaC14rSiCYXeu0l56+p/Yn2uLhOSYXJuqI=; b=EXghePfz9EraovJ6NODiGcnK2cWjOHO+vczoWU+jA9hJ9qGxPCVpRneKaWM0HBc2qV yTun7f+cjk94yN5j/jlsj2O4Fq2NNq1tMF7inPWAi7R61TPeFxEPIFYGw+46xhJLwp7T 4B02CKSETf8zKUQTj/REgDGKulgmMtwlxVBwiMp5mu3KQbrJJyeInSO2m2lniaxv0nVp eh11p9QcYxHmO6OsPih7leLwGKUaqAnpCQYWGfxSFprelfk6TYgc1/pzwa8oMaoowWD1 Frue9DEBaNXgB1RC+9gzE546pHbyF7EY9s4aC/Uismq9OOrHTC01Q+Kn4tYymELPYeyc KsFg== X-Gm-Message-State: AOAM532f1xyJSNpKpMgnj8OPepInN1s3n90IGjgVsuhjAKzVbAoqtLEi CyCIsxpecAR0zFZw2izmFkxYpX+caoYeL8xaKf3sDFn2+YKWwgiSvC0bYsQdw+6Lpg/cg0gZTuB r85L2LRbCeTrJhYOEkH0DJ80/ae3boUM0nxDflR5t+hN16DHZG61EDu3ft0ZHLpLOI23bFbCaXU E2Bbo+ X-Google-Smtp-Source: ABdhPJwu+QqjZaX6pA0YvJKz/MNvVIoZkbW0vMzXolB6ZmWIuJmlNVuEx8zsVsNw+eyN6K6AAcXv4A== X-Received: by 2002:a05:620a:101a:: with SMTP id z26mr762543qkj.300.1601914313771; Mon, 05 Oct 2020 09:11:53 -0700 (PDT) Received: from mutt-hbsd ([38.140.209.220]) by smtp.gmail.com with ESMTPSA id 90sm143007qtb.6.2020.10.05.09.11.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:11:52 -0700 (PDT) Date: Mon, 5 Oct 2020 12:11:52 -0400 From: Shawn Webb To: freebsd-git@freebsd.org Subject: Rough timeframe Message-ID: <20201005161152.w6dte2oa6o2fus7c@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="grf6437gmcaiv5lu" Content-Disposition: inline X-Rspamd-Queue-Id: 4C4lwW3lhlz45X4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=iIcBdo3b; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::734 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-4.41 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; NEURAL_HAM_MEDIUM(-1.04)[-1.045]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,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.05)[-1.055]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[hardenedbsd.org]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; NEURAL_HAM_SHORT(-0.21)[-0.211]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::734:from]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 16:11:56 -0000 --grf6437gmcaiv5lu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey FreeBSD git peeps, I'm curious if there's a rough timeline for the git migration. I'd like to know how to prioritize my tasks as a downstream consumer. 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 --grf6437gmcaiv5lu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl97RcUACgkQ/y5nonf4 4fr9Aw//aDuLVa/pYmcYizD0hQCscFews3SXsWeZxDsqDSF7B07e1shDcS1xiECf zO3qBgFOLdTbhf0ivo9kbn5TmLghWR8EH3ziuIS1U4+PVap4epdOUI/GFseCMNV+ Wezk9/ml00Z9ZiJxzm4+5A3stp7Xw/3gitzN16GrVkbEKZ+s5VbJYeIlKOiduqRF 5Bb/sL5i2wXQ9O8Nl76cFaGLTLgiBrtgvkQwOKr9EJ7wOHy6IPbvmggWtjltiQ4q DEgHNHYvDh6+H9qaXE5L2O2Y+5El2MbgQwyF9NsXIyDQopgOjVLd5JieyFa8egxW 6+qXGQz6+wm1j8ikI3uEIYGyluVzdySgKXhLaRUb7JnD5M5/O7USn88xHeK0NpCF zJ9FP+fd4Le2thao6QI1+/mEEe3EzDMN+TwET47R5TT6xKG2uaOOhw/AilASropm KzW+rw6fETioz4jGUUVdNWpG9F0OiEIUntyoXhEVOJmwRCHP8+VFz/YiamUdVUYo AzhqqVwaV+gtsEnygVNZQzUjWqQQ/OvoDGgi77fTG9UDVGUGaupqT9uD5bMrSca+ eLZ+FSP2vrTV6wu1T7YjMmBqtGO0IkIqAKZmalBJDJ0cFaBZCY66QMaTmmFJt78p 8A2dbtgmwt7nstnJX60nmIMM29jOF2Cxfjs43h/ZuGquFIZkCtU= =aqSm -----END PGP SIGNATURE----- --grf6437gmcaiv5lu-- From owner-freebsd-git@freebsd.org Mon Oct 5 18:23:40 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4EB2742C32C for ; Mon, 5 Oct 2020 18:23:40 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) (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 4C4prW3yhBz4K7t for ; Mon, 5 Oct 2020 18:23:39 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f173.google.com with SMTP id t7so3485290ilf.10 for ; Mon, 05 Oct 2020 11:23:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UpNrhdbc2DEV93nOywGRPII4sjG1wtiacAa8xXnHc3s=; b=DQT2F+nF41WXKSgT2k2rXPRNtuYIQvWTEtz3iEaygpIn+/Jj+7zVM5NrC6QS78Ls8w eCeQBEh7z80jWd8mZJC3+IwjDul3IB1VJ5Zk7bLGEZa7r6OCCn218MaT0pq/1U547zbL e1gmwmhN7APRVio3kuJMqryY30vpIP66+WFFFJYDIV9AAqqI1tAREdpHez2i3UUzT2IY HgK+7ETGwhOm7wWn4YR2RsmnogTuZyLIhCnIxZEyvPKa/0l2UBsdQKrWngAcmexyw9wW Ost0lY+up2R76ZFDaJolDxqhNX5PBIcplojlGUI3KVyfXzt+xs+5c1M7yhJi1PklYX2E vhYw== X-Gm-Message-State: AOAM531NX8nkCnDT4Cjx7TWk++autD7pdSfvMWvx0geZJKFnm25yTlcL w73wg1JbrXcyfmdDHgwP/R0qa5F1sE5/5qi/ymU= X-Google-Smtp-Source: ABdhPJz7HCpyBXodMRmMu51ZrFwacHKwQn/2+Sf13e4jCKiL4dDf7scF6xv8HkYM1CrXoDelAw6SH9GNpmkUN+FrlKs= X-Received: by 2002:a92:998d:: with SMTP id t13mr547394ilk.256.1601922218321; Mon, 05 Oct 2020 11:23:38 -0700 (PDT) MIME-Version: 1.0 References: <20201005161152.w6dte2oa6o2fus7c@mutt-hbsd> In-Reply-To: <20201005161152.w6dte2oa6o2fus7c@mutt-hbsd> From: Ed Maste Date: Mon, 5 Oct 2020 14:23:26 -0400 Message-ID: Subject: Re: Rough timeframe To: Shawn Webb Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4C4prW3yhBz4K7t 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.173 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.38 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.023]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RCVD_TLS_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.002]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.35)[-0.352]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.173:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.173:from]; 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:+]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 18:23:40 -0000 On Mon, 5 Oct 2020 at 12:12, Shawn Webb wrote: > > Hey FreeBSD git peeps, > > I'm curious if there's a rough timeline for the git migration. I'd > like to know how to prioritize my tasks as a downstream consumer. We're still working on a few dependencies before being able to commit to a final schedule - documentation in particular. Plan for after 12.2 and before the end of the year. From owner-freebsd-git@freebsd.org Wed Oct 7 13:30:24 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B880942F6A3 for ; Wed, 7 Oct 2020 13:30:24 +0000 (UTC) (envelope-from david@catwhisker.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 4C5wFD3vWsz4pWK for ; Wed, 7 Oct 2020 13:30:24 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 85EBA42F6A1; Wed, 7 Oct 2020 13:30:24 +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 85B6442F422 for ; Wed, 7 Oct 2020 13:30:24 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C5wFB6s6mz4ppH for ; Wed, 7 Oct 2020 13:30:22 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 097DUFL4038337 for ; Wed, 7 Oct 2020 13:30:15 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 097DUFtm038336 for git@freebsd.org; Wed, 7 Oct 2020 06:30:15 -0700 (PDT) (envelope-from david) Date: Wed, 7 Oct 2020 06:30:15 -0700 From: David Wolfskill To: git@freebsd.org Subject: [resolved] Re: Question on (my) workflow migration svn -> git Message-ID: <20201007133015.GA37695@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="82I3+IH0IqGh5yIs" Content-Disposition: inline X-Rspamd-Queue-Id: 4C5wFB6s6mz4ppH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-4.61 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.05)[-1.050]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_HAM_SHORT(-0.13)[-0.132]; NEURAL_HAM_MEDIUM(-1.03)[-1.028]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2020 13:30:24 -0000 --82I3+IH0IqGh5yIs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 24, 2020 at 01:17:15PM -0700, David Wolfskill wrote: > The migration (of my workflow) from cvs to svn was more "cosmetic" > than anything else -- the data store changed and the commands > changed, but the underlying thought processes behind what I was > doing stayed pretty much the same. >=20 > I have no idea if that will be the case for svn -> git, so I'm > putting this out for comments and, perhaps, some useful advice from > folks who are more familiar with git than I am. > ... After a fair bit of advice, opinions, and experimentation, I believe I may have arrived at a working approach -- and if I haven't got quite that far, I believe I am close enough to stop spamming the list after this note. :-} Caveat: The approaches discussed here are almost certainly NOT what you want if you are trying to set things up to commit back to the FreeBSD repo. This is for facilitating tracking FreeBSD. So, in case anyone else is (somewhat) similarly situated: * The fundamental concept I needed was the notion of a git "mirror" repo. I created the one I am using via: git clone --mirror https://cgit-beta.freebsd.org/src.git * A "mirror" git repo is also a "bare" git repo, in case that term may be more familiar. (A mirror has at least one addiitonal attribute -- I'm not claiming that "mirror" and "bare" are equivalent terms; rather, "mirror" implies "bare".) See the "--mirror" and "--bare" discussions from "git help clone" for details. * The above "mirror" repo is separate from any "working tree" -- which, for my use case, is desired (a requirement, really). This may be confusing to some folks (e.g., who may be accustomed to the notion of cloning a "normal" git repo, checking out a branch, hacking on code, committing, & pushing). That type of activity is not what the mirror repo is for. * The mirror repo is updated periodically (e.g., nightly) via "git fetch --all" (run on the machine where the repo resides). Sample output from such an update: Fetching origin =46rom https://cgit-beta.freebsd.org/src 05fcd86b60c0..59d5ed3afc99 main -> main f794cc249acc..13d175068ee9 releng/12.2 -> releng/12.2 3a305f9fbe30..37087976b6c2 stable/12 -> stable/12 + 4f5d6f8229a9...0af8f7422420 refs/notes/commits -> refs/notes/commits (f= orced update) * To then get a "working tree" (based on the mirror repo), there are a couple of options that I have found. (There may well be more. Two is sufficient for this discussion.) One may create a "worktree" for each branch to be tracked or one may create (what I will call) a "normal" git repo/working tree. Each has tradeoffs: * The "worktree" approach. This must be done by one who is able to update the mirror repo. It is created via (e.g.): cd ${mirror_repo} && git worktree add /usr/src ${branch} That done, output of "git status" should look fairly normal -- until the mirror gets updated. Once that happens, "git status" will generally show that any worktree now has some number of "Changes to be committed". To actually get the worktree to reflect the state of the mirror repo at that point: cd /usr/src && git reset --hard which ... may be a little counter-intuitive, but works (for reasons that begin to make sense once one delves into the current implementation -- so I make no promises as to how well-supported this model is). On advantage of the worktree is that is uses less disk space than a "normal" git repo/working tree (as in place of the latter's .git/ hierarchy, it merely has a file that references a subdirectory of ${mirror_repo}/worktrees). (Actual numbers near the end of this note.) * The '"normal" git repo/working tree' approach. This is done via a "normal" "git clone" operation, e.g.: git clone -b ${branch} file:///${mirror_repo} /usr/src As with the worktree, /usr/src does not get updated directly as a result of updating the mirror. To update /usr/src in this case, though: cd /usr/src && git pull works (as expected). And before the "git pull" is done (but after the mirror is updated), "git status" will show (e.g.): On branch main Your branch is up to date with 'origin/main'. (and should mention any local changes -- in my case, the "untracked" kernel config file). I believe, but have not actually got to the point of testing this empirically, that by using this approach, I can have the mirror owned and updated by a user that is not me, and have /usr/src owned by me (as I have been doing since the CVS days), and which I find attractive. I mentioned disk space up there. Actual numbers for my current experiment at the moment (with head ("main") at 59d5ed3afc99 and stable/12 at 37087976b6c2): * mirror: 1.8G * head worktree within mirror: 9.3M * stable/12 worktree within mirror: 9.1M * worktrees * head: 1.3G * stable/12: 1.4G * "normal" git repo/working trees: * head: 2.5G * stable/12: 2.2G For comparison, svn mirror at r366512: * mirror: 6.5G * /usr/src: * head: 5.0G * stable/12: 4.0G I hope this might be useful to someone. Peace, david --=20 David H. Wolfskill david@catwhisker.org "The economic outlook is strongest under the scenario in which Biden and the Democrats sweep Congress and fully adopt their economic agenda." -- Moody's Analytics See http://www.catwhisker.org/~david/publickey.gpg for my public key. --82I3+IH0IqGh5yIs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl99wuZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 Pckqagf/Q4ia2pJO1puPER4mwklP8SEfHcWPe7/852l8YhqAwxuhD1NG1eA1NBU/ V1aEkElnU1L+vuOr/ckkRoBGNTmpZlQ3XutHobQprTDJd0I6qqb8y2YW76gYfUfz Xxn9oEYrfuPNzaKnzKqx8pYugPMa/cNO+aMEyzr2uakmd909sGhfgBEyI+Ua9fT5 XORKeZAHJLhpwThC9eE4JpjLOS4KwcXH1xkygas1LOwZ11s5yIryUfkkWlcNlQTU oQzzRBbqmaxbGXAk4IEe3THRGczW1Nwx0Q8WxMy8elayEUt2DglNecBD7qVig1Qs FuCAxPN70B1KPeOD7pBOXu9oAoBvOg== =EoXN -----END PGP SIGNATURE----- --82I3+IH0IqGh5yIs-- From owner-freebsd-git@freebsd.org Fri Oct 9 12:49:02 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83F2A3F94A4 for ; Fri, 9 Oct 2020 12:49:02 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C77DZ2P31z4LZy for ; Fri, 9 Oct 2020 12:49:02 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 500113F949F; Fri, 9 Oct 2020 12:49:02 +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 4EBA33F975E for ; Fri, 9 Oct 2020 12:49:02 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C77DY1pfVz4Ljs for ; Fri, 9 Oct 2020 12:49:00 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 099Cmx7D061759 for ; Fri, 9 Oct 2020 12:48:59 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 099CmxBr061758 for git@freebsd.org; Fri, 9 Oct 2020 05:48:59 -0700 (PDT) (envelope-from david) Date: Fri, 9 Oct 2020 05:48:59 -0700 From: David Wolfskill To: git@freebsd.org Subject: Plans for ports & doc? Message-ID: <20201009124859.GL1349@albert.catwhisker.org> Reply-To: git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mgP3ep6s6oWoM+py" Content-Disposition: inline X-Rspamd-Queue-Id: 4C77DY1pfVz4Ljs X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [1.24 / 15.00]; HAS_REPLYTO(0.00)[git@freebsd.org]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.04)[-1.040]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_SHORT(-0.35)[-0.353]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_HAM_MEDIUM(-0.97)[-0.971]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; REPLYTO_EQ_TO_ADDR(5.00)[]; MAILMAN_DEST(0.00)[git]; RCVD_COUNT_TWO(0.00)[2] X-Spam: Yes X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 12:49:02 -0000 --mgP3ep6s6oWoM+py Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Now that I believe I have figured out how to track multiplpe branches (in my case, head and stable/12) for FreeBSD sources using git (as I had done with CVS and have been doing with svn), I plan to set up the "machinery" to track the (test) src repo (and switch to the "real" repo once it is available). [I will still be using svn for the sources I use to keep up-to-date, of course.] Do we have test ports and doc repos yet? Or are those to be addressed later? (If this has already been brought up, I apologize -- a pointer, rather than re-copying, would be quite sufficient.) Thanks! Peace, david --=20 David H. Wolfskill david@catwhisker.org "... our current political leaders have demonstrated that they are dangerously incompetent. We should not abet them and enable the deaths of thousands more Americans by allowing them to keep their jobs." -- New England Journal of Medicine editorial See http://www.catwhisker.org/~david/publickey.gpg for my public key. --mgP3ep6s6oWoM+py Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl+AXDtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnBDAf+OJJNugjXCeX9CuteHkselsitJVwXvckb97uDc9YP77on50KMhMlPh68U W92iJskmaqQeyrltMMNXwv907nIsit7fTBb9X7ZO6+9T/ybP/HjVXKnBEFCO13zH WxFz6R+cX/z5IqXWparxnVYP5EYBYfqnlGQVcT9m98YEzpjgwhl8RgAkqdtfZg3B yrQgzDi9pRI6maIbeMVCTzRtiOhFGDGy16yhzs6jkSBgMjjzYOnyAv6IO8UYy2mh L8dFlfrJYAsvpqyoVKo8iUD5YwcjLgkKgG1J1BBkD4+4P+A4IZs/AbdWzN9tedyj uTt8A6HFFaQSozEtx8rUs87BuBVOOA== =RLbE -----END PGP SIGNATURE----- --mgP3ep6s6oWoM+py-- From owner-freebsd-git@freebsd.org Fri Oct 9 17:22:25 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D3493FF908 for ; Fri, 9 Oct 2020 17:22:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C7FJ12CJ7z4cd3 for ; Fri, 9 Oct 2020 17:22:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 49DEF3FF559; Fri, 9 Oct 2020 17:22:25 +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 499F13FF98A for ; Fri, 9 Oct 2020 17:22:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 4C7FJ06mM8z4chR for ; Fri, 9 Oct 2020 17:22:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x736.google.com with SMTP id 140so9626003qko.2 for ; Fri, 09 Oct 2020 10:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=BaOXI8AssOw6h0K61jfXdLiDFMxq+qWOegKBnJhxp74=; b=LBQulwIhTGle9t8/HmRMBJeVqJxXXp0NWCUAYw0EkS4bEiVI8HA7gPqvQaoLWBoYli 8sKkFWgYu1m4K9nbL/iBlRntm9xGp/peUjlOZQaXgarL9FObx/Dr9OgetYeOnzwNx3vX qIXCdx0FlZ4AciKFfNJTIiu48JwDBoeFmcnRC8f7BX9SW0thwydY3jcg317FBfThKOut ZviNI1JPcFejXn7QXCo8n4rNNbYGbC+R1f9jpCFxuCB7kvvzVvXadF3dK4XmmH70Yov8 7FUgMdj12cBlOvaZEo7JQbbzEMH7zlWPHgIJtG3xzSamrAwAQQrKEW5S60stNxDdsjgt kJlA== 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=BaOXI8AssOw6h0K61jfXdLiDFMxq+qWOegKBnJhxp74=; b=Ao0X3si+Esjr8EEc6dRou+3nyrh9v2VMLZKcD3QRTXqhk3ulglS3fMBik5UB/nVnki 30z1jvregaF6+e+qC0IH2rHIzG5mSvUUc1IDnqedapCLhrABFWF2lBmDp3ZRHMjw8LK7 R1G1TG2oKGCBUsD7uToGQOs3RExB9A3xzWlSgdVUYWbDZM5S1uWDwLSlK6Hx2JSi3C3e L+ZcPrbOQ/4DJMNvY9/qmkS9qVime728xIro3rZ9IQ3a1cl4l+jSQl+dWIURJwH6JHNK EpKYQXe5HGhWdE4YqNSswHHFrciKxJfyCCxjOwBosDBWvJNBDpOdkYUomXH6xmcakIt4 8bXA== X-Gm-Message-State: AOAM533OXjaCWZ/hUxdgZvE/+9VCioipjYnHM49k2X2AfbVby9tFr5SJ FcLTbJKGwAiLLg/6iI50aM1Odr/PEaaoLMlKfS1grc6p3W+9pg== X-Google-Smtp-Source: ABdhPJwrcVPigRwkkPpljmA6t48jf7FHgcKfrFUmLoZxz5+uIsmKJeXlll4udzzGSY45dyNjrF0L2mkpxMItBoKp1YQ= X-Received: by 2002:ae9:eb97:: with SMTP id b145mr7271726qkg.60.1602264143582; Fri, 09 Oct 2020 10:22:23 -0700 (PDT) MIME-Version: 1.0 References: <20201009124859.GL1349@albert.catwhisker.org> In-Reply-To: <20201009124859.GL1349@albert.catwhisker.org> From: Warner Losh Date: Fri, 9 Oct 2020 11:22:12 -0600 Message-ID: Subject: Re: Plans for ports & doc? To: git@freebsd.org X-Rspamd-Queue-Id: 4C7FJ06mM8z4chR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 17:22:25 -0000 On Fri, Oct 9, 2020 at 6:49 AM David Wolfskill wrote: > Now that I believe I have figured out how to track multiplpe branches > (in my case, head and stable/12) for FreeBSD sources using git (as > I had done with CVS and have been doing with svn), I plan to set > up the "machinery" to track the (test) src repo (and switch to the > "real" repo once it is available). [I will still be using svn for the > sources I use to keep up-to-date, of course.] > > Do we have test ports and doc repos yet? Or are those to be addressed > later? (If this has already been brought up, I apologize -- a pointer, > rather than re-copying, would be quite sufficient.) > Repos are present. use 'ports' or 'docs' where you'd use 'src'. Warner From owner-freebsd-git@freebsd.org Sat Oct 10 12:41:17 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49B854469B3 for ; Sat, 10 Oct 2020 12:41:17 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C7l190SSmz3SSw for ; Sat, 10 Oct 2020 12:41:17 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 0FC3D446C07; Sat, 10 Oct 2020 12:41:17 +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 0F8884469B2 for ; Sat, 10 Oct 2020 12:41:17 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7l175Tjpz3SYq for ; Sat, 10 Oct 2020 12:41:15 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 09ACf85k074829 for ; Sat, 10 Oct 2020 12:41:08 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 09ACf823074828 for git@freebsd.org; Sat, 10 Oct 2020 05:41:08 -0700 (PDT) (envelope-from david) Date: Sat, 10 Oct 2020 05:41:08 -0700 From: David Wolfskill To: git@freebsd.org Subject: Re: Plans for ports & doc? Message-ID: <20201010124108.GE1349@albert.catwhisker.org> Reply-To: git@freebsd.org References: <20201009124859.GL1349@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="/5n7VZMW9/eSjDrm" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4C7l175Tjpz3SYq X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [1.33 / 15.00]; HAS_REPLYTO(0.00)[git@freebsd.org]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.99)[-0.988]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_SHORT(-0.31)[-0.306]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MAILMAN_DEST(0.00)[git]; REPLYTO_EQ_TO_ADDR(5.00)[] X-Spam: Yes X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Oct 2020 12:41:17 -0000 --/5n7VZMW9/eSjDrm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 09, 2020 at 11:22:12AM -0600, Warner Losh wrote: > On Fri, Oct 9, 2020 at 6:49 AM David Wolfskill wro= te: > ...=20 > > Do we have test ports and doc repos yet?... >=20 > Repos are present. use 'ports' or 'docs' where you'd use 'src'. > .... Thanks again, Warner -- here's empirical evidence for anyone interested: repo@freebeast:/repo/git/freebsd % foreach repo ( src ports doc ) = =20 foreach? git clone --mirror https://cgit-beta.freebsd.org/${repo}.git foreach? end Cloning into bare repository 'src.git'... remote: Enumerating objects: 6548090, done. remote: Total 6548090 (delta 0), reused 0 (delta 0), pack-reused 6548090 Receiving objects: 100% (6548090/6548090), 1.42 GiB | 1.83 MiB/s, done. Resolving deltas: 100% (4434261/4434261), done. Cloning into bare repository 'ports.git'... remote: Enumerating objects: 7637736, done. remote: Total 7637736 (delta 0), reused 0 (delta 0), pack-reused 7637736 Receiving objects: 100% (7637736/7637736), 998.37 MiB | 1.93 MiB/s, done. Resolving deltas: 100% (4561322/4561322), done. Cloning into bare repository 'doc.git'... remote: Enumerating objects: 760919, done. remote: Total 760919 (delta 0), reused 0 (delta 0), pack-reused 760919 Receiving objects: 100% (760919/760919), 276.78 MiB | 2.19 MiB/s, done. Resolving deltas: 100% (443178/443178), done. repo@freebeast:/repo/git/freebsd % date -u Sat Oct 10 12:36:18 UTC 2020 repo@freebeast:/repo/git/freebsd %=20 [Note: The above is for a specific type of "bare" repo -- suitable for what I am doing, but may not be ideal for other, perhaps more common, use cases.] Peace, david --=20 David H. Wolfskill david@catwhisker.org If you think what Trump received was a "cure," consider what he says and does since receiving it: would YOU want to be brought down to his level? See http://www.catwhisker.org/~david/publickey.gpg for my public key. --/5n7VZMW9/eSjDrm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl+Bq+RfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PckxxQf/b/5jyXWhmuHd2kR554jL3I2GZ9AZwIUM02LZi0fjmWKKevIii+GLpVAc jZgeeGKngEIn14Qn3OrzelKN7ZoeQpsYwMBhKwpf9TGPlj3luDpdqB4zvYE33iqZ fgEhXyIH9Rit8jR8oEn87JTrBPrJAgFj7kW2yD38oP9YHkpPxTwvCb3K8dfFRWYA iZGeTn7OMI3/TpWuFqwO/pvDXzKvuaVqZUlPzI/FbROVslQzNWzw/bcBVviQpw4G 6KucoLaFpOkb78mAwoGCT94gdlu2ur0fn55NzCWqyw3Cyo/Kx92SDy06rSRFkB4Z ErTflMZz/WcjicNzGHo5fHO+LqICSQ== =m1cV -----END PGP SIGNATURE----- --/5n7VZMW9/eSjDrm--