From owner-freebsd-git@freebsd.org Sun May 2 06:48:50 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 03F965FADC9 for ; Sun, 2 May 2021 06:48:50 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXxXK6lWSz3tQv for ; Sun, 2 May 2021 06:48:49 +0000 (UTC) (envelope-from pi@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id E5BAD5FADC8; Sun, 2 May 2021 06:48:49 +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 E45845FACAB for ; Sun, 2 May 2021 06:48:49 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXxXK620Zz3tt6; Sun, 2 May 2021 06:48:49 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD)) (envelope-from ) id 1ld5uH-000BDz-TK; Sun, 02 May 2021 08:48:45 +0200 Date: Sun, 2 May 2021 08:48:45 +0200 From: Kurt Jaeger To: Dimitry Andric Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FXxXK620Zz3tt6 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, 02 May 2021 06:48:50 -0000 Hi! > > # git checkout origin/main > > error: The following untracked working tree files would be overwritten by checkout: > > multimedia/transcode/files/patch-import_demux__pass.c > > multimedia/transcode/files/patch-import_extract__ac3.c > > multimedia/transcode/files/patch-import_extract__mp3.c > > multimedia/transcode/files/patch-import_extract__pcm.c > > [...] > > Please move or remove them before you switch branches. > > [...] > > Ah yes, I was assuming that you were starting with a clean tree. In this > case you could have used "git stash" to stash away the changes, and get > them back later. # git stash No local changes to save > > Ok, I deleted those, but then > > > > git show > > > > shows me details of [...] > > $ git branch -d main > > error: Cannot delete branch 'main' checked out at '/pou/ports/default' > > $ git branch -D main > > error: Cannot delete branch 'main' checked out at '/pou/ports/default' > > That means you are using worktrees, so indeed then you cannot delete the > main branch, as that other location is using it. I was not aware that I use a worktree, but this is the list of worktrees in use: # git worktree list /pou/ports/default 7e1519526 [main] git worktree remove /pou/ports/default fatal: '/pou/ports/default' is a main working tree > In this case you should probably use "git reset --hard", like Warner > suggested. # git reset --hard HEAD is now at 7e1519526 textproc/uim: Fix incorrect use of USE_RUBY. > After using this, use a regular "git pull" to get your local > main branch in sync with origin/main again. Done, now git show lists $ git show #ommit dc5a6492de7a0b3e79d48a02f4678c5af4467e40 (HEAD -> main, origin/main, origin/HEAD) [...] Again I expected that 'git show' does not display anything, as I should be in the state of a pristine repo without anything to show ? -- pi@FreeBSD.org +49 171 3101372 Now what ? From owner-freebsd-git@freebsd.org Sun May 2 09:43: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 60B995FE8C3 for ; Sun, 2 May 2021 09:43:10 +0000 (UTC) (envelope-from pi@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 4FY1PV1RYJz4VrL for ; Sun, 2 May 2021 09:43:10 +0000 (UTC) (envelope-from pi@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 2F5CC5FEC12; Sun, 2 May 2021 09:43:10 +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 2F1FF5FE8C2 for ; Sun, 2 May 2021 09:43:10 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FY1PT5VnWz4VtF; Sun, 2 May 2021 09:43:09 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD)) (envelope-from ) id 1ld8d0-000Bb4-GO; Sun, 02 May 2021 11:43:06 +0200 Date: Sun, 2 May 2021 11:43:06 +0200 From: Kurt Jaeger To: Dimitry Andric Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FY1PT5VnWz4VtF X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE]; 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: Sun, 02 May 2021 09:43:10 -0000 Hi! > > After using this, use a regular "git pull" to get your local > > main branch in sync with origin/main again. > > Done, now git show lists > > $ git show > #ommit dc5a6492de7a0b3e79d48a02f4678c5af4467e40 (HEAD -> main, origin/main, origin/HEAD) > [...] > Again I expected that 'git show' does not display anything, as > I should be in the state of a pristine repo without anything I did a new test with a fresh clone (took 15min to download), and 'git show' shows the latest commit, so it looks like this is how it is supposed to be. -- pi@FreeBSD.org +49 171 3101372 Now what ? From owner-freebsd-git@freebsd.org Sun May 2 10:25:23 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 53B285FFCBF for ; Sun, 2 May 2021 10:25:23 +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 4FY2LC0CNnz4XFq for ; Sun, 2 May 2021 10:25:23 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 071A65FFCBD; Sun, 2 May 2021 10:25:23 +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 06E335FFCBC for ; Sun, 2 May 2021 10:25:23 +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 4FY2LB5YlVz4XFp; Sun, 2 May 2021 10:25: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 142APKE8007527; Sun, 2 May 2021 10:25:20 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 142APKFM007526; Sun, 2 May 2021 03:25:20 -0700 (PDT) (envelope-from david) Date: Sun, 2 May 2021 03:25:20 -0700 From: David Wolfskill To: Kurt Jaeger Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: Reply-To: git@freebsd.org References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="t2ODfjmsEPYDR2zC" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FY2LB5YlVz4XFp 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, 02 May 2021 10:25:23 -0000 --t2ODfjmsEPYDR2zC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 02, 2021 at 08:48:45AM +0200, Kurt Jaeger wrote: > ... > Done, now git show lists >=20 > $ git show > #ommit dc5a6492de7a0b3e79d48a02f4678c5af4467e40 (HEAD -> main, origin/mai= n, origin/HEAD) > [...] > Again I expected that 'git show' does not display anything, as > I should be in the state of a pristine repo without anything > to show ? > .... Empirically, in my environment, "git show" appears to default to "show"ing the commit at the tip of HEAD. That seems to correspond with what "git help show" states. Peace, david --=20 David H. Wolfskill david@catwhisker.org "some of the terminology that was used, like 'hugs and kisses,' and 'very fine people,' is like very different from what I experienced and what my co-workers experienced on the 6th." - Michael Fanone, DC Metro Police Offic= er See https://www.catwhisker.org/~david/publickey.gpg for my public key. --t2ODfjmsEPYDR2zC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmCOfhBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PckACgf+Ooxi3lTT3wGVuzUbX9rNV6aCMXjRxAnXwJn5HjxxQBBb6Lp9sxlP+Q8q m7gaWoaxruqSAoRW1dsIIo0lZcp0oIUhj0/iqFGXNsCU80psdv4ql0Odd0456U/7 60EkOKq6dbob1RdOEIxu409coFQD+x0OHee+wCxTxZT3dSNvD4nui8ATQdjk9037 fRd/cV9jtOBWsooCri970G49Df81ECx7FtzUykwXPT+JP6U4DUpeif7QSePrPU4s TSiQWS44AYzMs7fu+enR2eOXph2DWGsgj31F+DBCnqnZJcSoQvmthNM87h5l3zN0 2VT4W4wblKb8fnToKjagYu/9Ox8wJg== =o0QR -----END PGP SIGNATURE----- --t2ODfjmsEPYDR2zC-- From owner-freebsd-git@freebsd.org Sun May 2 10:48: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 C3FDA621325 for ; Sun, 2 May 2021 10:48:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FY2rV52vHz4Y4m for ; Sun, 2 May 2021 10:48:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id AD2D6621324; Sun, 2 May 2021 10:48:10 +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 ACF4B5FFEDC for ; Sun, 2 May 2021 10:48:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FY2rV4SQPz4Y0G; Sun, 2 May 2021 10:48:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 5E636B6DB; Sun, 2 May 2021 10:48:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (unknown [IPv6:2001:470:7a58:0:e0d3:13d5:7e22:8d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id A09965AB1A; Sun, 2 May 2021 12:48:08 +0200 (CEST) From: Dimitry Andric Message-Id: <1F752FD8-BD49-4BE2-BABE-DDB28BC3CF9A@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_7D90F677-C7FC-4B82-A714-B9F5B49DC0A3"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.80.0.2.43\)) Subject: Re: Ports tree have been migrated to git Date: Sun, 2 May 2021 12:47:54 +0200 In-Reply-To: Cc: git@freebsd.org To: Kurt Jaeger References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> X-Mailer: Apple Mail (2.3654.80.0.2.43) 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, 02 May 2021 10:48:10 -0000 --Apple-Mail=_7D90F677-C7FC-4B82-A714-B9F5B49DC0A3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 2 May 2021, at 08:48, Kurt Jaeger wrote: >=20 >>> # git checkout origin/main >>> error: The following untracked working tree files would be = overwritten by checkout: >>> multimedia/transcode/files/patch-import_demux__pass.c >>> multimedia/transcode/files/patch-import_extract__ac3.c >>> multimedia/transcode/files/patch-import_extract__mp3.c >>> multimedia/transcode/files/patch-import_extract__pcm.c >>> [...] >>> Please move or remove them before you switch branches. >>> [...] >>=20 >> Ah yes, I was assuming that you were starting with a clean tree. In = this >> case you could have used "git stash" to stash away the changes, and = get >> them back later. >=20 > # git stash > No local changes to save Yes, this is because you manually got rid of those files. Normally, if you have several outstanding changes in your working copy, you use "git stash" (the full command is actually "git stash push") to stash away those changes. Then you can do stuff like pulling, merging or whatever you like, and finally you do a "git stash pop" to get your outstanding changes back. For instance, if you are working on some patch, and somebody in your team says "I've pushed a fix, please pull", you would typically do: git stash git pull git stash pop >>> Ok, I deleted those, but then >>>=20 >>> git show >>>=20 >>> shows me details of > [...] >>> $ git branch -d main >>> error: Cannot delete branch 'main' checked out at = '/pou/ports/default' >>> $ git branch -D main >>> error: Cannot delete branch 'main' checked out at = '/pou/ports/default' >>=20 >> That means you are using worktrees, so indeed then you cannot delete = the >> main branch, as that other location is using it. >=20 > I was not aware that I use a worktree, but this is the list of = worktrees > in use: >=20 > # git worktree list > /pou/ports/default 7e1519526 [main] Ah, I think that what happened is that your initial "git checkout origin/main" failed because of your untracked files, and then you did not repeat the "git checkout origin/main" after getting rid of those files? In that case, the local 'main' branch was still checked out in your one-and-only working tree, which is why it cannot be deleted, at that point. (Unfortunately it is not easy to give git "recipes" that work in any and all situations, as local changes can influence what git will do. Here, I was assuming you had a clean working area, which was not the case.) > $ git show > #ommit dc5a6492de7a0b3e79d48a02f4678c5af4467e40 (HEAD -> main, = origin/main, origin/HEAD) > [...] > Again I expected that 'git show' does not display anything, as > I should be in the state of a pristine repo without anything > to show ? "git show" without any further arguments does not show the current changes in your working tree, but the contents of HEAD. Usually that is the last commit on the branch that you have checked out. If you want to see an overview of changes you have done in your current working tree, use "git status" instead. -Dimitry --Apple-Mail=_7D90F677-C7FC-4B82-A714-B9F5B49DC0A3 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYI6DWgAKCRCwXqMKLiCW oxHAAJ9Eek2lGZqWOlu6TIjky8pXb+GBJQCdHrB262iaTEk1kwPD+sm2cgwk/LY= =AvPh -----END PGP SIGNATURE----- --Apple-Mail=_7D90F677-C7FC-4B82-A714-B9F5B49DC0A3-- From owner-freebsd-git@freebsd.org Sun May 2 11:35: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 D88E662255F for ; Sun, 2 May 2021 11:35:21 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FY3tw43Ylz4bGc for ; Sun, 2 May 2021 11:35:20 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 4BD9C9BF8 for ; Sun, 2 May 2021 20:35:09 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1619955309; bh=KaXRT5jvJNTI2Ae24SYcG5fB3aIM8MEe8f2EZQRcNfI=; h=Date:To:Subject:From; b=w0szo0MUCAR1euthPzCbzk5fI4VLvwjNkGy/7aI3/BHkWcgODEm2nXbT+LEf42Q8W c6+WC4eYs4vjm+LPEJyNlzs2G5axBnLkXqXc2wwlpHcnoZMenVhS26BODBqvuMzcz5 SJRL64+aOk0F5L5yLjNaaNbZxpL5LxV5xYyN6zvZY+GGXKFNyEN7sFFafqU0ZJRS9E FHq8n2JyaHywwnE0nJWvmSqAIQmVPe4koOLb10X9mPrTQdDGY4Kvs/9okkEuzv/KqS BBawbVDys2w4KZlFfwbjyVtaWAM3hJQaPd4enXF5TU1DEiaD7VWslzn/MtBnu9Ousd W68yNsbLtXUgw== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 4284921C8D; Sun, 2 May 2021 20:35:08 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.2 at eastasia.home.utahime.org Date: Sun, 02 May 2021 20:33:11 +0900 (JST) Message-Id: <20210502.203311.1220959374911462213.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Downloading specified file through cgit From: Yasuhiro Kimura X-Mailer: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FY3tw43Ylz4bGc X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=w0szo0MU; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [-0.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2021 11:35:21 -0000 Hello All, Assuming that following 4 items are provided, is it possible to download corresponding file through cgit? * Repository (e.g. src) * Branch (e.g. main) * Commit hash (e.g. ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01) * Path of file (e.g. /sys/conf/newvers.sh) I tried to find it by clicking around links on the web interface of cgit.freebsd.org but couldn't find right path. Best Regards. --- Yasuhiro Kimura From owner-freebsd-git@freebsd.org Sun May 2 11:50:38 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 837EA622A6F for ; Sun, 2 May 2021 11:50:38 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 4FY4DY4GJTz4bpF for ; Sun, 2 May 2021 11:50:37 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x330.google.com with SMTP id l24-20020a7bc4580000b029014ac3b80020so64279wmi.1 for ; Sun, 02 May 2021 04:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=QGW3RGfwbs/k7Qe/NOfryMozD4M/9quNQqdmzhD3qq0=; b=Vul4Qx4vbdgR6K250BMMzicDfJzF0lSM0rcs68BLikrXrVXRwL3DMHh61Lk11X5h12 Rl8GL1h+Azp3U0y90dXz7QLjAIQ4Ytk8X8AbWhzmVjDJk9Auh4nDWg35SETVc6js23cm HDJuE4/wCC4EFSG9uFObCWK/CcUThzXWdb+6yAOlum2RmaWRgGxezWz2S5MfDgTjz08T Bk77WUx1EyGkFdfeafH4befITScJyU0rU3fSTkzK+YxgNf5XlOx7M43UPHqIkb/5udpn BZ1qVj5AhNY86Ef3dAjZ/EmA2SWZabovRqqkg1G7t4ZapIbrvQzsBXvbL82uzjTu01rW +1bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=QGW3RGfwbs/k7Qe/NOfryMozD4M/9quNQqdmzhD3qq0=; b=IaOfCr70lfL9OwkrHCN+o6dLRjFWgSUb2wlSPc/yn8bgVW25LGSBIOlOU8YBCBmPyV 6i+kwrE7ZUNS7TQJATzdbBLDJ5msT2N9hqRy5eXO8OTANaDEbb87mgu1egJ8LLm43YVi n+IsNz2xBSyR8UyOsWdHA0+RqvzPgjZuT+OgjMu+7K5ZBlGC6OtKlpEyX9Bh8Nbjhhwf LdRjWTGpxl17leiy+mU1AUP8os9GZJNt75pY2ySIqENYs/4EnqdOeoANrW+2aLD7a9nC unmodiQkbI5EuFm7k3eQWjWK7FVUULptEWNtDCJatmFzwBpEZYia6mO4Vn4YfT0hEpGY /qEg== X-Gm-Message-State: AOAM531vFiUfUQ0gvXLyEVzN2E1pDPk82uqtfMTwaztZzlPPiwoYPxJR PV46g00ybSFyJfmr4C/1rmNMGu75DX1NaQ== X-Google-Smtp-Source: ABdhPJyCl9dR+LQVusGBx0R7vzGFyMEM76lYn0mlRbcU3/CGlsY8hHzoBKFPTUI6YJ+Z50lsEOnonA== X-Received: by 2002:a1c:f313:: with SMTP id q19mr15922410wmq.142.1619956235684; Sun, 02 May 2021 04:50:35 -0700 (PDT) Received: from [192.168.1.10] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id g13sm4514426wrd.41.2021.05.02.04.50.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 May 2021 04:50:35 -0700 (PDT) Subject: Re: Downloading specified file through cgit To: freebsd-git@freebsd.org References: <20210502.203311.1220959374911462213.yasu@utahime.org> From: Graham Perrin Message-ID: <3fc9b16b-edd0-d34f-8653-7a89da830fa4@gmail.com> Date: Sun, 2 May 2021 12:50:34 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210502.203311.1220959374911462213.yasu@utahime.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-Rspamd-Queue-Id: 4FY4DY4GJTz4bpF X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=Vul4Qx4v; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::330 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]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; 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:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::330: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]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; 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]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::330:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::330:from]; 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: Sun, 02 May 2021 11:50:38 -0000 On 02/05/2021 12:33, Yasuhiro Kimura wrote: > Hello All, > > Assuming that following 4 items are provided, is it possible to > download corresponding file through cgit? > > * Repository (e.g. src) > * Branch (e.g. main) > * Commit hash (e.g. ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01) > * Path of file (e.g. /sys/conf/newvers.sh) > > I tried to find it by clicking around links on the web interface of > cgit.freebsd.org but couldn't find right path. For the example above: To the right, a menu. Select 'range' then enter and seek the hash. Result: Whenever a path is unknown, I lean towards GitLab e.g. or the comparable find file feature in GitHub. From owner-freebsd-git@freebsd.org Sun May 2 12:03:15 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 1CAF86239CD for ; Sun, 2 May 2021 12:03:15 +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 4FY4W61gcvz4cj4 for ; Sun, 2 May 2021 12:03:14 +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 142C36t1010923; Sun, 2 May 2021 12:03:06 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 142C35bM010922; Sun, 2 May 2021 05:03:05 -0700 (PDT) (envelope-from david) Date: Sun, 2 May 2021 05:03:05 -0700 From: David Wolfskill To: Yasuhiro Kimura Cc: freebsd-git@freebsd.org Subject: Re: Downloading specified file through cgit Message-ID: Reply-To: freebsd-git@freebsd.org References: <20210502.203311.1220959374911462213.yasu@utahime.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="FhU4Z/AOMYOwZtfo" Content-Disposition: inline In-Reply-To: <20210502.203311.1220959374911462213.yasu@utahime.org> X-Rspamd-Queue-Id: 4FY4W61gcvz4cj4 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.22 / 15.00]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.17)[0.168]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-0.99)[-0.992]; 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]; 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: Sun, 02 May 2021 12:03:15 -0000 --FhU4Z/AOMYOwZtfo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 02, 2021 at 08:33:11PM +0900, Yasuhiro Kimura wrote: > Hello All, >=20 > Assuming that following 4 items are provided, is it possible to > download corresponding file through cgit? >=20 > * Repository (e.g. src) > * Branch (e.g. main) > * Commit hash (e.g. ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01) > * Path of file (e.g. /sys/conf/newvers.sh) >=20 > I tried to find it by clicking around links on the web interface of > cgit.freebsd.org but couldn't find right path. > ... I *think* so. Here's what I did: * Direct a browser to https://cgit.freebsd.org/ * Select "src" * Near the upper-right corner, there is a window for a "search" argument; copy/paste the hash there * Just to the left of that is a selection menu that defaults to "log msg". Select that; change it to "range" * Select the "search" button. * The resulting page should show a list of commit messages, the top one of which is "newvers.sh: restore reporting branch names". Select that message (click on it). * The resulting page should show the sommit message and the diff (basically, the result from "git show ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01") * The page includes at least 3 links to versions of newvers.sh; at least 2 of those are the version at ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01, and at least one is the prior version. The one just under the "Diffstat" link and the one shown as "b/sys/conf/newvers.sh" are at ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01. Select one of them. * The resulting page shows: path: root/sys/conf/newvers.sh blob: 605e61181decd485fc6ad2bba74f6be99b4920be (plain) (blame)=20 The "(plain)" and "(blame)" are links. Right-click (button 3) the "(plain)" link; select "Save link as" and save the file. * You now have a copy of the file at ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01. Peace, david --=20 David H. Wolfskill david@catwhisker.org "some of the terminology that was used, like 'hugs and kisses,' and 'very fine people,' is like very different from what I experienced and what my co-workers experienced on the 6th." - Michael Fanone, DC Metro Police Offic= er See https://www.catwhisker.org/~david/publickey.gpg for my public key. --FhU4Z/AOMYOwZtfo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmCOlPlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 Pcn7Bwf/Xy17mseKNthBbc0GMxt0/CPzj09XbcoP4YzvmfYLi4ApsGfq6bMohZXq IKzzXSvMG+ol/FG8yMxTM61gfhTj6qVzBmUqxpk0HzQpqenrpXKBQEQeijkcPEtb D5qAi8uoHHqpLksrJbgAWN9E4ofF4ZqmST7WDH5W1glWJdjU752z+zUIwiCwiJAL QF0WgpP//OHSy5Q4RJVZEwuIQl1c2hhFDVlDHiP+JDq8k1vkw3XHpnPY9DIm4WqO Ax/yFZNpj0A/S7ujOVMFiyj52zvsqrBDspqpOFRsgZ2XA1xH9ziPNurGVw8WbEoz NfYOp3jiCP3YWSyc3LmCRoBq8qcgTg== =FoD5 -----END PGP SIGNATURE----- --FhU4Z/AOMYOwZtfo-- From owner-freebsd-git@freebsd.org Sun May 2 12:24:26 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31898623FF4 for ; Sun, 2 May 2021 12:24:26 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FY4zX6GFLz4dKT for ; Sun, 2 May 2021 12:24:24 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 698CD9BFD for ; Sun, 2 May 2021 21:24:19 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1619958259; bh=KIj5HNqok4SOAYnakwSYdVIw80cAhZSyOyUJHIoRZ9E=; h=Date:To:Subject:From:In-Reply-To:References; b=hhtT5Mq4ab1sq2hZKYjoLQ2oeo4VC5ze3AAPojj9OWF18BTx9zOS+fL9zwqguEsch ltdVU/kIdHPBzVDT2/E3Lev+TwQfdThq6LCQBfW+79xd1sJNnpIDIu5JnfFH8R+83o 2e3kHs45e68l9TGfhy9buiIxG6IfdgtkGVT7ITyS2CKvF6N8rQJw08Ubga545LrqiX PaUIWNi4lbQzL7ngC/7Po7Qv5KPE5h+XRK6dMKuJm+ziSaC+mZVVHOofiolwDxZF+H KVao4F7onxYsTLd5MLP8c3gRghAR/yrKkTp3s96OzIBQ4BNsp7XBJNpJUUvrC14Itj pO+JJq7AbDQ+Q== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 5413F21B4C; Sun, 2 May 2021 21:24:18 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.2 at eastasia.home.utahime.org Date: Sun, 02 May 2021 21:23:56 +0900 (JST) Message-Id: <20210502.212356.183690317350285241.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Re: Downloading specified file through cgit From: Yasuhiro Kimura In-Reply-To: References: <20210502.203311.1220959374911462213.yasu@utahime.org> X-Mailer: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FY4zX6GFLz4dKT X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=hhtT5Mq4; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [-0.69 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org:c]; MV_CASE(0.50)[]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; NEURAL_HAM_SHORT(-0.99)[-0.986]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[utahime.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2021 12:24:26 -0000 From: David Wolfskill Subject: Re: Downloading specified file through cgit Date: Sun, 2 May 2021 05:03:05 -0700 > I *think* so. Here's what I did: Thank you for replay. > * The resulting page should show the sommit message and the diff > (basically, the result from "git show > ace7209ce04d0e4dc0e84d5e2eb27fc762e67a01") I could also reached this page with different path but couln't go ahead. Now I reached what I want and I'll be able to trace proper path next time I face similar situation. --- Yasuhiro Kimura From owner-freebsd-git@freebsd.org Mon May 3 08:37: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 C88A262B82B for ; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@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 4FYbv15MJkz4bHg; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from [IPv6:2a02:6d40:36f3:4201:f062:5a7e:7354:11bf] (unknown [IPv6:2a02:6d40:36f3:4201:f062:5a7e:7354:11bf]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mfechner) by smtp.freebsd.org (Postfix) with ESMTPSA id 6014524FC2; Mon, 3 May 2021 08:37:17 +0000 (UTC) (envelope-from mfechner@freebsd.org) Subject: Re: Script rmport shows error message To: Rene Ladan Cc: freebsd-git@freebsd.org References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> From: Matthias Fechner Message-ID: Date: Mon, 3 May 2021 10:37:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US 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, 03 May 2021 08:37:17 -0000 Am 01.05.2021 um 19:17 schrieb Rene Ladan: > It might indeed be because you have a remote it does not expect: > > if ! ${GIT} diff --exit-code remotes/origin/main ; then > ... > fi > > Here I have: > % git remote -v > origin https://git.freebsd.org/ports.git (fetch) > origin git@gitrepo.FreeBSD.org:ports.git (push) I think this should be fixed in the script, as the documentation here: https://docs.freebsd.org/en/articles/committers-guide/ is using the remote alias freebsd and not origin which I think was a very decision. I modified the script now locally (in a tmp folder) and removed the obsolete ports. I also saw a problem with the question if I would like to tweak the commit message. I told there y but it just had not shown me the commit message to modify it. I had to manually do a: git commit --amend Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook From owner-freebsd-git@freebsd.org Mon May 3 11:34: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 5BC5263000B for ; Mon, 3 May 2021 11:34:56 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FYgr027mlz4kGf; Mon, 3 May 2021 11:34:56 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620041696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rkjx7Ml7MNbNx1+I7mkCy5Ni+nXWYA6dAhWHDIy+KXc=; b=Ts8U2lJuncnJXB7wLTKGh6jyLDukvhm71zJq2K1er3VUeVKyBGdjD6jlwIY120uB2xGS9h Tq4Ld0zFXzglJ0dnop/SGvo2lzZ563mN0IAr610RrER2Hk0Tpn/UrHSD0tHcIprCZdNPtG DTTFcN6Yy5Ea4TH+YBPX0fpIMiy8rStsiSe5a0OmV3AGkJBpibSoUT0ahxWoDA6/nF8Sik ekxMth7twjboJT+CLng2SGQre2Bp7U4YVe8K4h4N5YPu1n6IAogVRfmHpR/RAouNeKbcja m2AvoMu3DBJuD64uqvaWV0eXYZvi60GPOYin9EeFtwahpCsxlRyUXRrjSBJq0g== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 3158B10D41; Mon, 3 May 2021 11:34:56 +0000 (UTC) Date: Mon, 3 May 2021 11:34:56 +0000 From: Rene Ladan To: Matthias Fechner Cc: freebsd-git@freebsd.org Subject: Re: Script rmport shows error message Message-ID: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1620041696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rkjx7Ml7MNbNx1+I7mkCy5Ni+nXWYA6dAhWHDIy+KXc=; b=J1uf3IGSmnJLXg9JA64ANfsoYtnOMzDhDoROlEgl2596Ip42zaLLCGyUx9po7sK0Ok2aF2 RAcF7wZQzB1xKMBBBzestoo3/BAhcIJkhgGTvAHNzNWtFUULltZqCdN/X1PV1kSKvyLrx5 Zwnux/tuLgTB/P81hUFaovCMThP2eQ594bDa943xcQAAMjuK67TOtzh3ku6OYwiKLs6pXh CPmLjR/IAFegporA2ZeYFH9GMSPBIUahlfWnZArHkRwgjlvdNqeAv9aHKsvkkq5+vcC9QI 1RO6/naBDurUrQREYvrU/AKtyn0wWEbJyuhpnc6N09jtRhv8nAzLO8jV3YnqDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1620041696; a=rsa-sha256; cv=none; b=ZCPoD6NNaPjulDOgEE8lMtHMQsj2hHJG+2tQ76/+XRe8KT3bjKyL4iaJGSxhUqJ6bl73br lTR6F3VW/XitBVr7xND6pOkpcO/w+Y/ZLUQdjolWcDY+5pcddnAnLN5Gj6yL22rBgmGOMC 8lV13Oq4nRW5rCgDCBA82cK7apNQfOC2odZEXPm9mr0tvZsZrZX5SomDlpnF10jYh6s5jr IosWbP7IYJgaMSLjC9gyMHFapLNEiD9G1JoiZHFize5IWj79Hp0rTfzk7oWHUNBjDkv+vj 6678hXYiaYVlqk0OfTTJo3LBEEHkawM6c7tuLu/U+o13rDtnbK+YM6WjR+aryg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 11:34:56 -0000 On Mon, May 03, 2021 at 10:37:15AM +0200, Matthias Fechner wrote: > Am 01.05.2021 um 19:17 schrieb Rene Ladan: > > It might indeed be because you have a remote it does not expect: > > > > if ! ${GIT} diff --exit-code remotes/origin/main ; then > > ... > > fi > > > > Here I have: > > % git remote -v > > origin https://git.freebsd.org/ports.git (fetch) > > origin git@gitrepo.FreeBSD.org:ports.git (push) > > I think this should be fixed in the script, as the documentation here: > https://docs.freebsd.org/en/articles/committers-guide/ > > is using the remote alias freebsd and not origin which I think was a > very decision. > > I modified the script now locally (in a tmp folder) and removed the > obsolete ports. This sounds like something upstreamable. > I also saw a problem with the question if I would like to tweak the > commit message. > I told there y but it just had not shown me the commit message to modify it. > > I had to manually do a: > git commit --amend Yes, the flow is somehow broken if you choose yes but I don't see why. René From owner-freebsd-git@freebsd.org Thu May 6 20:05:15 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 F139162CE08 for ; Thu, 6 May 2021 20:05:15 +0000 (UTC) (envelope-from eniorm@gmail.com) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (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 4Fbl1R221Lz51wW for ; Thu, 6 May 2021 20:05:15 +0000 (UTC) (envelope-from eniorm@gmail.com) Received: by mail-wr1-x429.google.com with SMTP id l13so6863392wru.11 for ; Thu, 06 May 2021 13:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=92NmlkeQn7WKq0waRVc/UWGQGirERC37sBqTEeYI418=; b=UoCMzeN5+dv8KpLpsGu/S5+HyJAIm88c1OZNJ6Sw2v5nrjWGV51+QN1ZkpuvK8LVg9 N4x2LRYNKEAc6LZ4UMltC2H6VOV29xDnpnsohrOM1Xi7godSLyKQvNkDwtrP/Xeh0cyc 9a7wwKAMUg6T7SzS1MSdpyO/4XQVbMWhD8hY6TXU4dr4EMJ9/RSPhlsNkjESA8TKPijF 0h/+WdW5/LCiyJsA+OxbUbwUSxa7/vTOZB8IdtQev9fIoOwD0iJz+E60MySsVDk/e2O8 /wxrj6m8jwLLRzsIgdb76Z6aqEq8eeod5vIFKKgQvfPWLUrYUZjRBC5bH+vDNAAv+gxq pXqg== 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=92NmlkeQn7WKq0waRVc/UWGQGirERC37sBqTEeYI418=; b=UeDADF+tJ1dP/TvGoQUBMcIqJ6SYwUkPagVC+8uihSPH2+RzFRi6ovp/MCvpLqYUJh psta/FpdkmduBO9/HXKxvh47eQinyyQm2s3f9jYF7lJpKnmCkcUVU8JGo+Ljb+zxpQga nBLgFjh+a62W+hRJh7501hH6Z3adz4WKYDBvpDsX0Dl5EZ0aX07oGHL6QxyX5M5qfjFK 8Ak+fyrYcHtDKAVQ8oJTLXRhqU2v4vt28HgIBY/fBvEcTziOReP6NWXBm/wb2XPiMYdM 5KYdgF/P7LI9ePPL2FqRAGx9L11bANeVsFsOGu/5MDiD/agApSQrpJ54Isv/vGRo61M7 COVw== X-Gm-Message-State: AOAM533Jhg/PlnVVMCkgWJIag+FydgV3BVIzZ7cqjuAViSX3dFSIZXUk zXN1EybuBs7kOIhW8PtCYKQWNszfzuPrxTKLslo34Rua7mU= X-Google-Smtp-Source: ABdhPJzb3o9Pdz9laRId0E23gP5H1FnRR57VAe8NGQO1rFn88FoAYUmWzvmMTo52Yhy8zaEsngtt/ByQiavR/cjh1S0= X-Received: by 2002:a5d:598f:: with SMTP id n15mr7548618wri.21.1620331513541; Thu, 06 May 2021 13:05:13 -0700 (PDT) MIME-Version: 1.0 From: Enio Marconcini Date: Thu, 6 May 2021 17:04:35 -0300 Message-ID: Subject: Error on git clone (error: inflate: data stream error (incorrect data check)0 KiB/s) To: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Fbl1R221Lz51wW X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=UoCMzeN5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of eniorm@gmail.com designates 2a00:1450:4864:20::429 as permitted sender) smtp.mailfrom=eniorm@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450: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)[2a00:1450:4864:20::429:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/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)[2a00:1450:4864:20::429:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::429: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: Thu, 06 May 2021 20:05:16 -0000 Hello there... I got FreeBSD 13 VHD virtual machine image from official site. Install git from pkg and try to upgrade sources via git using this command: git clone --branch stable/13 https://git.FreeBSD.org/src.git /usr/src and result this error: Cloning into '/usr/src'... remote: Enumerating objects: 378088, done. remote: Counting objects: 100% (378088/378088), done. remote: Compressing objects: 100% (26879/26879), done. error: inflate: data stream error (incorrect data check)0 KiB/s fatal: pack has bad object at offset 1320508: inflate returned -3 fatal: fetch-pack: invalid index-pack output any tip? -- *[]s* *Enio Rodrigo Marconcini* *"**We are made of star stuff**"* From owner-freebsd-git@freebsd.org Fri May 7 17:59:33 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 564BE63725B for ; Fri, 7 May 2021 17:59:33 +0000 (UTC) (envelope-from mandree@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 4FcJ9x23q3z4v0k for ; Fri, 7 May 2021 17:59:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree.no-ip.org (p4fe5242b.dip0.t-ipconnect.de [79.229.36.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 1BEFA7260 for ; Fri, 7 May 2021 17:59:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from ryzen.an3e.de (localhost [IPv6:::1]) by ryzen.an3e.de (Postfix) with ESMTP id 868D312019F for ; Fri, 7 May 2021 19:59:30 +0200 (CEST) Subject: Re: Error on git clone (error: inflate: data stream error (incorrect data check)0 KiB/s) To: freebsd-git@freebsd.org References: From: Matthias Andree Message-ID: <519036c2-8aad-f625-df6b-500e390f7d89@FreeBSD.org> Date: Fri, 7 May 2021 19:59:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2021 17:59:33 -0000 Am 06.05.21 um 22:04 schrieb Enio Marconcini: > Hello there... > > I got FreeBSD 13 VHD virtual machine image from official site. Install git > from pkg and try to upgrade sources via git using this command: > git clone --branch stable/13 https://git.FreeBSD.org/src.git /usr/src > > and result this error: > > Cloning into '/usr/src'... > remote: Enumerating objects: 378088, done. > remote: Counting objects: 100% (378088/378088), done. > remote: Compressing objects: 100% (26879/26879), done. > error: inflate: data stream error (incorrect data check)0 KiB/s > fatal: pack has bad object at offset 1320508: inflate returned -3 > fatal: fetch-pack: invalid index-pack output > > any tip? > Enio, how much RAM does your virtual machine have? Initial clones tend to be memory hungry. You may want a shallow (i. e. no history) single-branch check-out on the VM.