Date: Thu, 14 Sep 2023 10:57:13 +0200 From: Matthias Apitz <guru@unixarea.de> To: freebsd-ports@freebsd.org Subject: Re: problem with git-pull Message-ID: <ZQLK6SwlJJTXCLah@pureos> In-Reply-To: <7cot-21li-wny@FreeBSD.org> References: <ZQGAIu39ULBpMSNY@pureos> <7cot-21li-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <rcm@rcm.sh> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZQLK6SwlJJTXCLah>