From owner-freebsd-ports@freebsd.org Tue Apr 6 12:02:07 2021 Return-Path: Delivered-To: freebsd-ports@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 566265CE7BE for ; Tue, 6 Apr 2021 12:02:07 +0000 (UTC) (envelope-from mbeis.bsd@xs4all.nl) Received: from lb3-smtp-cloud8.xs4all.net (lb3-smtp-cloud8.xs4all.net [194.109.24.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.xs4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF5jp1Gykz4gXt for ; Tue, 6 Apr 2021 12:02:05 +0000 (UTC) (envelope-from mbeis.bsd@xs4all.nl) Received: from localhost.lan ([IPv6:2001:980:66e8:1:902b:5b96:d750:fe16]) by smtp-cloud8.xs4all.net with ESMTP id TkPDlF6eXgIC3TkPEl3xFY; Tue, 06 Apr 2021 14:02:05 +0200 Received: from localhost (localhost [IPv6:0:0:0:0:0:0:0:1]) by localhost.lan (8.16.1/8.16.1) with ESMTPS id 136C23xp052505 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Tue, 6 Apr 2021 14:02:03 +0200 (CEST) (envelope-from mbeis.bsd@xs4all.nl) Date: Tue, 6 Apr 2021 14:01:58 +0200 (CEST) From: Marco Beishuizen Reply-To: Marco Beishuizen To: freebsd-ports@freebsd.org Subject: Re: cannot git clone into /usr/ports when separate filesystem In-Reply-To: <20210406115552.g36obve33viemqjr@nexus.home.palmen-it.de> Message-ID: <11267378-ec44-e419-d93-b36f81143d0@xs4all.nl> References: <20210406111541.xm5dl4crfpdgngky@nexus.home.palmen-it.de> <1ee44b53-78e3-8d81-e7ec-7c0486c557f@xs4all.nl> <20210406115552.g36obve33viemqjr@nexus.home.palmen-it.de> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfKvkMghW7YKqthQ7E0gPBklAnQuRtXk2Krg+uR1Wogp68lWBuCjKXttgaUwLtHbn+ps9LKPesJpaxlGYnpnk8CwC1mIwZoadqtVgMQvVKiVGn7C+Sh2j cJoGZ8BfvIUdb1jVSus3Via0uWFVf2Cw7RTlWHu2RrZRv2lYfGwcMMGCLuwy0MWDXugwolxsE/g2nTL4dxVy1Q79pjM3g+RgSNMvNz04wHRwWb5fpb6/vznH +c4SaM8VqxQERlCt78b9iQ== X-Rspamd-Queue-Id: 4FF5jp1Gykz4gXt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mbeis.bsd@xs4all.nl designates 194.109.24.29 as permitted sender) smtp.mailfrom=mbeis.bsd@xs4all.nl X-Spamd-Result: default: False [-2.40 / 15.00]; HAS_REPLYTO(0.00)[mbeis.bsd@xs4all.nl]; RWL_MAILSPIKE_GOOD(0.00)[194.109.24.29:from]; R_SPF_ALLOW(-0.20)[+ip4:194.109.24.0/24:c]; FREEMAIL_FROM(0.00)[xs4all.nl]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; CTYPE_MIXED_BOGUS(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; FREEMAIL_ENVFROM(0.00)[xs4all.nl]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[194.109.24.29:from]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[194.109.24.29:from]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_REPLYTO(0.00)[xs4all.nl]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[194.109.24.29:from:127.0.2.255]; DMARC_NA(0.00)[xs4all.nl]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MAILMAN_DEST(0.00)[freebsd-ports] Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 12:02:07 -0000 On Tue, 6 Apr 2021, the wise Felix Palmen wrote: > Where did you clone from? The official repo is only available for a few > hours now. So, if you cloned from a mirror (Github, Gitlab, …?), some > breakage with the transition seems plausible. > > Ah, please no CC, thanks. >From https://git.freebsd.org/ports.git. It's up since yesterday. Cloning after totally emptying /usr/ports worked fine, but today git complained about corrupt files in the .git subdirectory so I decided to start over again. Regards, Marco -- Thrashing is just virtual crashing. From owner-freebsd-ports@freebsd.org Tue Apr 6 12:02:28 2021 Return-Path: Delivered-To: freebsd-ports@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 63C555CE84E for ; Tue, 6 Apr 2021 12:02:28 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF5kC3g7Mz4gR2 for ; Tue, 6 Apr 2021 12:02:27 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 796eebf2; Tue, 6 Apr 2021 12:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180501; bh=m9KlDNjC W/4PmoUXHPoKOWflo5k=; b=e+FrpIkSnumCdE5Bkdwh+rZH1CEUd3ifvdhqKb1C HAF6Kk8Jl8Yst6/q+/NmY4fc3jGLqjLdCmGkkDBpOSsPnilR6+feo7bEWzluKSpt /IrXIRvh6o/V55JwvELZ8lV1XO9SntBwAa+4c5DBLB7ley0VL37tdO0n1FP6O4MI xe0l2RDs83B9RHqC/w+HGiQLjGYIR8+VfGk42nIbACai+mTW7KzieAtUbSkigQ1T CMa+HHtKEvfokeOXeJo3QOhiJFgvNcYLVfdXRZfDcJv82IxmD68vKBFoSXp8Vj6i A5UQBEu9A0KckQl6sKbS3qkUq1v1Go/cZV1O3Jm80i1vSA== DomainKey-Signature: a=rsa-sha1; c=nofws; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=20180501; b=Za 1/G58n7fhVd3csffbtOyGDbfbUjN0+BzoumD5cqeul08ynhfuy1GX361ntO+IyR9 rwiiWg5zbQ4bOI1D026u+KWVTCABwhJabhljU/GdyQOhBbydZB/LtBGj06RUnWVF hi3yTmfMEN5h0r9CzWpTJTbwXq+2QQltrjF1MI24EhD1zKm/8OwpnD4LZNxz7UsG ZOdg40SiVFZg02JtEJ3XTACn9Cmd+UTA93NrwF1o8gYkgVe8gKgN6vM+d4IAAj4L 6FNifGb9agUu2Kt1x3yY4AKmguIQ74350Y2WmjwbpbdCV0yxtFNdFSxqw8b+nruu 4BxUJIiP1+rAIRurk6OQ== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id 9edc66f7 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Tue, 6 Apr 2021 12:02:24 +0000 (UTC) Date: Tue, 6 Apr 2021 14:02:00 +0200 From: Michael Gmelin To: Marco Beishuizen Cc: freebsd-ports@freebsd.org Subject: Re: cannot git clone into /usr/ports when separate filesystem Message-ID: <263A58B9-594E-46E5-9563-1D28910F3D27@grem.de> In-Reply-To: References: X-Face: $wrgCtfdVw_H9WAY?S&9+/F"!41z'L$uo*WzT8miX?kZ~W~Lr5W7v?j0Sde\mwB&/ypo^}> +a'4xMc^^KroE~+v^&^#[B">soBo1y6(TW6#UZiC]o>C6`ej+i Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWJBwe5BQDl LASZU0/LTEWEfHbyj0Txi32+sKrp1Mv944X8/fm1rS+cAAAACXBIWXMAAAsTAAAL EwEAmpwYAAAAB3RJTUUH3wESCxwC7OBhbgAAACFpVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIFRoZSBHSU1QbbCXAAAAAghJREFUOMu11DFvEzEUAGCfEhBVFzuq AKkLd0O6VrIQsLXVSZXoWE5N1K3DobBBA9fQpRWc8OkWouaIjedWKiyREOKs+3PY fvalCNjgLVHeF7/3bMtBzV8C/VsQ8tecEgCcDgrzjekwKZ7TwsJZd/ywEKwwP+ZM 8P3drTsAwWn2mpWuDDuYiK1bFs6De0KUUFw0tWxm+D4AIhuuvZqtyWYeO7jQ4Aea 7jUqI+ixhQoHex4WshEvSXdood7stlv4oSuFOC4tqGcr0NjEqXgV4mMJO38nld4+ xKNxRDon7khyKVqY7YR4d+Cg0OMrkWXZOM7YDkEfKiilCn1qYv4mighZiynuHHOA Wq9QJq+BIES7lMFUtcikMnkDGHUoncA+uHgrP0ctIEqfwLHzeSo+eUA66AqzwN6n 2ZHJhw6Qh/PoyC/QENyEyC/AyNjq74Bs+3UH0xYwzDUC4B97HgLocg1QLYgDDO1v f3UX9Y307Ew4AHh67YAFFsxEpkXwpXY3eIgMhAAE3R19L919nNnuD2wlPcDE3UeT L2ytEICQib9BXgS2fU8PrD82ToYO1OEmMSnYTjSqSv9wdC0tPYC+rQRQD9ESnldF CyqfmiYW+tlALt8gH2xrMdC/youbjzPXEun+/ReXsMCDyve3dZc09fn2Oas8oXGc Jj6/fOeK5UmSMPmf/jL+GD8BEj0k/Fn6IO4AAAAASUVORK5CYII= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4FF5kC3g7Mz4gR2 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=grem.de header.s=20180501 header.b=e+FrpIkS; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@grem.de designates 213.239.217.29 as permitted sender) smtp.mailfrom=freebsd@grem.de X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[grem.de:s=20180501]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:213.239.217.29/32]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grem.de]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SPAMHAUS_ZRD(0.00)[213.239.217.29:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[grem.de:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FREEMAIL_TO(0.00)[xs4all.nl]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[213.239.217.29:from]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-ports] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 12:02:28 -0000 > On 6. Apr 2021, at 13:10, Marco Beishuizen > wrote: >=20 > =EF=BB=BFHi, >=20 > I'm trying to git clone the portstree into /usr/ports. /usr/ports is > a separate filesystem so it contains a .sujournal file. But now git > complains "fatal: destination path 'ports' already exists and is not > an empty directory." >=20 > So my question is what to do next? Recreating a new .sujournal every > time a ports tree needs to be cloned is quite annoying. Like Felix wrote, you clone exactly once and then you only pull for updates. Assuming /usr/ports is empty besides the .sujournal file, I would do: cd /usr/ports git clone https://git.freebsd.org/ports.git removeme mv removeme/.* removeme/* . rmdir removeme git status git pull Note that "Invalid Arguments" errors are expected on the mv command (this could be replaced by a fancy find command, like `find removeme \ -mindepth 1 -maxdepth 1 -exec mv {} . \;`, but this was easier). Also, in case "git status" shows something like "Untracked filed .sujournal", add ".sujournal" to your global git excludes file. Example: git config core.excludesFile=3D$HOME/.gitexcludes echo .sujournal >>$HOME/.gitexcludes In case you don't want to override the excludesFile setting, alter one of the config files in the default global location $XDG_CONFIG_HOME/git/ignore[0]. Best, Michael [0] `man git-config` says: core.excludesFile Specifies the pathname to the file that contains patterns to describe paths that are not meant to be tracked, in addition to .gitignore (per-directory) and .git/info/exclude. Defaults to $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. See gitignore(5).