From nobody Thu Sep 14 08:57:13 2023 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RmWRm5k7Rz4t09g for ; Thu, 14 Sep 2023 08:57:40 +0000 (UTC) (envelope-from guru@unixarea.de) Received: from ms-10.1blu.de (ms-10.1blu.de [178.254.4.101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RmWRl5GXpz4VhJ for ; Thu, 14 Sep 2023 08:57:39 +0000 (UTC) (envelope-from guru@unixarea.de) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of guru@unixarea.de designates 178.254.4.101 as permitted sender) smtp.mailfrom=guru@unixarea.de; dmarc=none Received: from [212.222.85.178] (helo=pureos) by ms-10.1blu.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qgiAL-00FKVH-7D for freebsd-ports@freebsd.org; Thu, 14 Sep 2023 10:57:37 +0200 Date: Thu, 14 Sep 2023 10:57:13 +0200 From: Matthias Apitz To: freebsd-ports@freebsd.org Subject: Re: problem with git-pull Message-ID: Reply-To: Matthias Apitz Mail-Followup-To: freebsd-ports@freebsd.org References: <7cot-21li-wny@FreeBSD.org> List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7cot-21li-wny@FreeBSD.org> X-Operating-System: FreeBSD 13.0-CURRENT r368166 (amd64) X-message-flag: Mails containing HTML will not be read! Please send only plain text. X-Con-Id: 51246 X-Con-U: 0-guru X-Originating-IP: 212.222.85.178 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.35 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.66)[-0.658]; MID_RHS_NOT_FQDN(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:178.254.4.101]; MIME_GOOD(-0.10)[text/plain]; ONCE_RECEIVED(0.10)[]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[freebsd-ports@freebsd.org]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:42730, ipnet:178.254.0.0/19, country:DE]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_XOIP(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DMARC_NA(0.00)[unixarea.de]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; HAS_REPLYTO(0.00)[guru@unixarea.de] X-Rspamd-Queue-Id: 4RmWRl5GXpz4VhJ El día miércoles, septiembre 13, 2023 a las 11:40:57 +0200, Jan Beich escribió: > There are but not officially[1] supported by ports/ e.g., > > $ rm -rf security/wpa_supplicant > $ git checkout origin/main security/wpa_supplicant > $ git commit -m '[local] security/wpa_supplicant: sync with "main" branch' > > or ... Thanks, Jan. I've tested as a dry run for the next time your first proposal: $ cd ports $ rm -r security/wpa_supplicant $ git checkout origin/main security/wpa_supplicant 18 Pfade von 32879931c792 aktualisiert $ git checkout origin/main security/wpa_supplicant 0 Pfade von 32879931c792 aktualisiert $ ls -l security/wpa_supplicant total 40 -rw-r--r-- 1 root wheel 8032 14 Sep 09:45 Makefile -rw-r--r-- 1 root wheel 170 14 Sep 09:45 distinfo drwxr-xr-x 16 root wheel 512 14 Sep 09:45 files -rw-r--r-- 1 root wheel 684 14 Sep 09:45 pkg-descr -rw-r--r-- 1 root wheel 122 14 Sep 09:45 pkg-plist $ git log security/wpa_supplicant commit 3a88706af1e87ff0bd2857398137194da462c85c Author: R. Christian McDonald Date: Mon Sep 11 22:24:29 2023 -0700 ... $ git commit -m '[local] security/wpa_supplicant: sync with "main" branch' On branch main Your branch is up to date with 'origin/main'. It took 3.28 seconds to enumerate untracked files. See 'git help status' for information on how to improve this. nothing to commit, working tree clean What is the purpose of the above 'git commit ...'? It seems to not have any effect. matthias -- Matthias Apitz, ✉ guru@unixarea.de, http://www.unixarea.de/ +49-176-38902045 Public GnuPG key: http://www.unixarea.de/key.pub