From owner-freebsd-git@freebsd.org Sun Sep 27 16:42:03 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A96542171A for ; Sun, 27 Sep 2020 16:42:03 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bzryy4WZyz3yYF for ; Sun, 27 Sep 2020 16:42:02 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id 185so8793203oie.11 for ; Sun, 27 Sep 2020 09:42:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NWzGFq3FKNBnooz2RS+lRzRR3tiQLD5scx431+mMGB0=; b=gFnENGac2GhMx5KHhmAhPetYyIbibesesVq0lLzIA9RSKtl2OuCz+tkkws6WljS1eH PnQpo98NBxGS4gsqGPrgNNT7HWyP3FPOmP2s3IGRh5hwn4foXkTXv43XTw3xq0754XIv 6hX6C7X2ET73cw7iNgNLR07oDMF2XODqWWV95lK4WKZj/0d0gKhWNTV+arAe8JF1zFLm fSi7yfyojMzSmWT74jtlTcKfhQG+fx1x7EKg49Lo8RAyGBrA++WFdBjITcNuollPTIcF H+Em/yKesjJq/WbTzkD+zWIlc7Y2M3t38T3Mn9egR3HZ6HzU9FvvXtAeDfKj95QktUjz vtqQ== X-Gm-Message-State: AOAM533hxFLNHSIeb6+ZIOYFF+Ir+sLp9vW4qbIq7ngIzOp+PzWKFK5Q CrEMKB6MK/nTUwgl6p8JdiGlmBygiGYaLaTFZqVDHRii X-Google-Smtp-Source: ABdhPJyrEdF64RR34BenO5IgivFwxaNeamnfMedLl+ozikaWqMRc6vy9SSGA3tELp6qurmph1ZZzb4QpAqFQdg+1m94= X-Received: by 2002:aca:49c2:: with SMTP id w185mr3685763oia.101.1601224920993; Sun, 27 Sep 2020 09:42:00 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sun, 27 Sep 2020 18:41:49 +0200 Message-ID: Subject: Heads up: beta git repo hashes changing this weekend To: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Bzryy4WZyz3yYF X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-1.83 / 15.00]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.76)[-0.759]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_SHORT(-0.13)[-0.133]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.179:from]; NEURAL_HAM_MEDIUM(-0.94)[-0.942]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.179:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] 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: Sun, 27 Sep 2020 16:42:03 -0000 Hey folks, another Sunday has rolled around and we've updated the commit history for doc, src, ports to be more true to what really happened. This means all hashes are now different and pulling from the repo will sadly cause almost all commits to be re-fetched. The contents are still the same, so it is theoretically easy to transplant your work from one branch to the other, but the details around this are messy. Cheers Uli From owner-freebsd-git@freebsd.org Sat Oct 3 22:35: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 430743F1F06 for ; Sat, 3 Oct 2020 22:35:40 +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 4C3hXD0W2rz3fBw for ; Sat, 3 Oct 2020 22:35:40 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 0F9663F1F05; Sat, 3 Oct 2020 22:35:40 +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 0E3F13F24C5 for ; Sat, 3 Oct 2020 22:35:40 +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 4C3hXB4Hdlz3fBt; Sat, 3 Oct 2020 22:35:38 +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 093MZVxh077730; Sat, 3 Oct 2020 22:35:31 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 093MZVr9077729; Sat, 3 Oct 2020 15:35:31 -0700 (PDT) (envelope-from david) Date: Sat, 3 Oct 2020 15:35:31 -0700 From: David Wolfskill To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20201003223531.GA77534@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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ikeVEW9yuYc//A+q" Content-Disposition: inline In-Reply-To: <20200926124212.GL92039@acme.spoerlein.net> X-Rspamd-Queue-Id: 4C3hXB4Hdlz3fBt 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.92 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(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]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_HAM_LONG(-1.04)[-1.043]; NEURAL_HAM_MEDIUM(-1.03)[-1.026]; NEURAL_HAM_SHORT(-0.45)[-0.448]; RCPT_COUNT_TWO(0.00)[2]; 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: Sat, 03 Oct 2020 22:35:40 -0000 --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 26, 2020 at 02:42:12PM +0200, Ulrich Sp=F6rlein wrote: > ... > Please start from this and only this: >=20 > git clone --bare https://cgit-beta.freebsd.org/src.git 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. So I blew that old one (and its associated worktrees) away -- at this point, I am experimenting and trying to get all the "breaking stuff" out of my system before I actually need to use got. Looking at the output of "git help clone", it seemed to me that "--mirror" (which is claimed to imply "--bare") might be ... reasonable: | --mirror | Set up a mirror of the source repository. This implies --bare. | Compared to --bare, --mirror not only maps local branches of the | source to local branches of the target, it maps all refs (including | remote-tracking branches, notes etc.) and sets up a refspec | configuration such that all these refs are overwritten by a git | remote update in the target repository. since I want to have a mirror of the FreeBSD repo, after all. I then re-created the "head" and "stable_12" worktrees. (This was back on 20 September.) I left it alone until a few minutes ago, when I did: * cd /repo/git/freebsd/src.git/ * git show # to see what it would do; it showed a commit # log entry from Cy Schubert * git fetch --all I kinda guessed on that last, but it pulled some data for a while, spewed some status-type messages, and exited status code 0. * git show # Now showed a commit log entry from Emmanuel # Vadot so that seems like it might be progress. The worktress, now, if I try "git status", claim that there's a large number of "Changes to be committed:" -- but the most recently-updated file in the worktree has an mtime of "Sep 30 20:31:50 2020". But "git log" shows (e.g., in the stable12 worktree): | commit 4015a56f10fd83a4f222f5c34e63c15d7fea272f (HEAD -> stable/12) | Author: Kyle Evans | Date: Sat Oct 3 13:27:57 2020 +0000 |=20 | MFC r361254: Fix Typo in ng_hci_le_connection_complete_ep struct. | =20 | PR: 246538 |=20 | Notes: | svn path=3D/stable/12/; revision=3D366395 And it seems that "git pull" (as such) doesn't work with worktrees: | g1-48(12.2-S)[22] git pull | There is no tracking information for the current branch. | Please specify which branch you want to merge with. | See git-pull(1) for details. |=20 | git pull |=20 | If you wish to set tracking information for this branch you can do so wit= h: |=20 | git branch --set-upstream-to=3Dorigin/ stable/12 |=20 | g1-48(12.2-S)[23]=20 Trying to look up information about git worktrees, I find examples of transient worktrees -- they are created, code is devloped, committed, and pushed, and the worktree is destroyed. If a new one is wanted, it is created. 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. > The worktree stuff is then as simple as this: >=20 > % cd src.git > % git show-ref|grep stable.12 > e9c4330183dcfe8a5d26843613adc0a348fd0544 refs/heads/stable/12 > % git worktree add ../stable_12 stable/12 > Preparing worktree (checking out 'stable/12') > Updating files: 100% (81262/81262), done. > HEAD is now at e9c4330183d MFC r360483,360484: Make nvmecontrol work > with nda like it does with nvd, and associated bits. > % git worktree add ../current main Yes -- asa noted above, the "git worktree add ..." seems to have worked. Thank you. :-) > ....=20 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. --ikeVEW9yuYc//A+q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl94/LNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 Pckx7ggAuASeCPpvPu+yrJJhMgLeaOFSiFyuHsZ+EUfbVfF892YEtfErofP5sN7p XRhOoX7PXGE+qOOG2s3Wxwbvtxbnc4ML2G0V4k7c5t1PRGIIXVxeKomKUsJrSbkY cZVUIvmuE/5IvXseGwtA570CGPZG7BfMfO0bTs7+m3u+rLdUsBFrqdv48Po68mKl DOXzuFkjdn1jgwinhioftTr2HTeRx8NaiL1WJ5fzfWmXcr9b129Buk7M9DL0be7q SESK2cBFbx6+n5aUkn0JMtudvdZrQrOXkx8enEHaGcNhoxKVx2xJKdFbjtHUnXS5 44bPPgN1a9NqF62X/TsB3Xrrk19wVA== =6/D3 -----END PGP SIGNATURE----- --ikeVEW9yuYc//A+q--