From owner-freebsd-ports@freebsd.org Tue Apr 6 13:29:22 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 4FC275D1955 for ; Tue, 6 Apr 2021 13:29:22 +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 4FF7fT0mSYz4sgn for ; Tue, 6 Apr 2021 13:29:20 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 9a73fc86; Tue, 6 Apr 2021 13:29:17 +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=uEUzg/TS a5uoEsOR+m3PpW94I9g=; b=Kiga+xJtB+0f8dj1Pk9ffKXn62V0YDLI+etDLK+x 62/SPtMBQeSYN0lYKaJCvhZZM0E8uHuSJf0OAGenOooFDo6Pma2NoncE7bARrmF8 aZ4rQDzOiGvwZrubMVbdeHerla9Bveki/4b+vAHc0gihFXL8Vt8zXNbtME3fjSuQ 3gqxdFWvmv1cW2TtEdXOYpOp9WuCuWaLZPYlQX/DxWljUx7n96JSA5xSjFizw6fU 6kCVc+6Ow2lhIX+urZZxlA8nSAkxu7AklaqZq+QSSNDQi8Ju5czbyZhMOZMAI4no dcik8gNYPaYZ/H2si/qz1z0FIjM0Q/33/Q2Y4c+Xbruzsw== 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=jv GycArraodrqk2c3jwhE0qZnmCb1Fyz/kQ7UMOX+eY0QWV+RzrOyaeqO2E+3jXmVI k2JoQdjLLZSwWuWqJvPnrapShoM3IQlN/ZwHLWsuVJtG/bLaSRe5ZqoT6ZDJTggf Ic/lHKaryRRW6AApHZw48N5bbovCBxipI/6ZJilD6By+DyMRYI/73/2sj6gtgpSu yHOhibq5IGON0+va4cZpVm96SUv9bQGEXQG8XBvElJdEcYurRpcVINorGsIZ7mk/ cEZqOCxktFVU0Ebj0dVG5O6lBBSPT8GKQnd9hf6sp7XJ3MPcOCy/s7COa/+Kk+v3 dDLTpAKKDNRBD/GAx5fA== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id ec158990 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Tue, 6 Apr 2021 13:29:16 +0000 (UTC) Date: Tue, 6 Apr 2021 15:28:53 +0200 From: Michael Gmelin To: freebsd@oldach.net (Helge Oldach) Cc: mbeis.bsd@xs4all.nl, freebsd-ports@freebsd.org Subject: Re: cannot git clone into /usr/ports when separate filesystem Message-ID: <20210406152853.11f43bdc@bsd64.grem.de> In-Reply-To: <202104061312.136DCggM012531@nuc.oldach.net> References: <202104061312.136DCggM012531@nuc.oldach.net> 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=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FF7fT0mSYz4sgn X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=grem.de header.s=20180501 header.b=Kiga+xJt; 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]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:213.239.217.29/32]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[grem.de]; 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:+]; NEURAL_HAM_SHORT(-1.00)[-0.996]; 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]; FREEMAIL_CC(0.00)[xs4all.nl,freebsd.org] 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 13:29:22 -0000 On Tue, 6 Apr 2021 15:12:42 +0200 (CEST) freebsd@oldach.net (Helge Oldach) wrote: > Marco Beishuizen wrote on Tue, 06 Apr 2021 14:25:51 +0200 (CEST): > > On Tue, 6 Apr 2021, the wise Helge Oldach wrote: > > > cd /usr/ports > > > git init . > > > git remote add -t main -f freebsd > > > https://git.freebsd.org/ports.git > > > > This created new .git subdirectories but still cannot clone into > > /usr/ports. > > Sorry, I forgot: git checkout main > > Once done, just regularly: git pull --ff-only > > Explanation: "clone" is roughly equivalent to "init + remote add + > checkout". Separating the three steps will allow for the -f (--force) > option on "remote add" which will ignore already existing files. > Kind of re-sending what I wrote earlier, as I managed to have diverging HTML and plain text alternatives in my previous email (facepalm). I wouldn't bother to get all these details right and instead just clone somewhere else and move files into place, e.g.: 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=$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).