From nobody Sat Sep 30 13:38:24 2023 X-Original-To: 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 4RySwL6Srbz4w61y for ; Sat, 30 Sep 2023 13:38:26 +0000 (UTC) (envelope-from roberthuff@rcn.com) Received: from smtp.rcn.com (mail.rcn.syn-alias.com [129.213.13.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RySwK70vKz4FpC for ; Sat, 30 Sep 2023 13:38:25 +0000 (UTC) (envelope-from roberthuff@rcn.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=rcn.com header.s=20180516 header.b=cLJ29jZr; spf=pass (mx1.freebsd.org: domain of roberthuff@rcn.com designates 129.213.13.252 as permitted sender) smtp.mailfrom=roberthuff@rcn.com; dmarc=pass (policy=none) header.from=rcn.com DKIM-Signature: v=1; a=rsa-sha1; d=rcn.com; s=20180516; c=relaxed/simple; q=dns/txt; i=@rcn.com; t=1696081105; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=C/xXS4M0BQDTpjhTwI1yu4kabfA=; b=cLJ29jZrpy/7Ty31OFxcg4DEi1nyXZZJBE4U39YYTvXnIjBVMsERIO6AQH6Oo0Kh /NjYvqN2lZ2CYH26BPhkZiflsbB3IQqjjm3AanFgkt09zxyy6zIVNm3NHkZTt2Va rwqWwdocMkljhLLrA6m89/F9wtmJPNQcgQTrsl/b4zNfyM6lLsi41tBnF7/8INge d7rMU9bxTRyYmdDzIUHGGaSgHwz0/WHH6kAaMRAuTFx9/EjS1xHSPGvFDRCq5d0a CDFxCANJlDD8A+zM+E6BHlCK3zofsZnVEZXqbLjYw4O45PoPS7olQXrRO2Cmgfnu MwXi/1kw7tjCMvhP/vAZEQ==; X-Authed-Username: cm9iZXJ0aHVmZkByY24uY29t Received: from [130.44.151.156] ([130.44.151.156:12587] helo=jerusalem.litteratus.org.litteratus.org) by smtp.rcn.com (envelope-from ) (ecelerity 4.4.1.20033 r(msys-ecelerity:tags/4.4.1.0^0)) with ESMTPSA (cipher=AES256-GCM-SHA384) id BA/53-05311-1D428156; Sat, 30 Sep 2023 09:38:25 -0400 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=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <25880.9424.185373.229455@jerusalem.litteratus.org> Date: Sat, 30 Sep 2023 09:38:24 -0400 From: Robert Huff To: ports@freebsd.org Subject: quick git question X-Mailer: VM 8.2.0b under 29.1 (amd64-portbld-freebsd14.0) X-Vade-Verdict: clean X-Vade-Analysis-1: gggruggvucftvghtrhhoucdtuddrgedvkedruddugddthecutefuodetggdotefrodftvfcurfhrohhf X-Vade-Analysis-2: ihhlvgemucfujgfpteevqfftpdftvefppdfgpfggqdftvefppdfqfgfvnecuuegrihhlohhuthemucef X-Vade-Analysis-3: tddunecunecujfgurhepgggtgffkfffhvffuofesthejredtredtvdenucfhrhhomheptfhosggvrhht X-Vade-Analysis-4: ucfjuhhffhcuoehrohgsvghrthhhuhhffhesrhgtnhdrtghomheqnecuggftrfgrthhtvghrnhepudef X-Vade-Analysis-5: udegteeiledufefhiedtffetkeegjefhkeeukeegveffkeelvdejvdelgeefnecukfhppedufedtrdeg X-Vade-Analysis-6: gedrudehuddrudehieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpedufedt X-Vade-Analysis-7: rdeggedrudehuddrudehiedphhgvlhhopehjvghruhhsrghlvghmrdhlihhtthgvrhgrthhushdrohhr X-Vade-Analysis-8: ghdrlhhithhtvghrrghtuhhsrdhorhhgpdhmrghilhhfrhhomheprhhosggvrhhthhhufhhfsehrtghn X-Vade-Analysis-9: rdgtohhmpdhrtghpthhtohepphhorhhtshesfhhrvggvsghsugdrohhrghdpmhhtrghhohhsthepshhm X-Vade-Analysis-10: thhptddvrdhrtghnrdgvmhgrihhlqdgrshhhuddrshihnhgtrdhlrghnpdhnsggprhgtphhtthhopedu X-Vade-Analysis-11: pdhishgpnhgrpehtrhhuvgdprghuthhhpghushgvrheprhhosggvrhhthhhufhhf X-Vade-Client: RCN X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[rcn.com,none]; R_SPF_ALLOW(-0.20)[+ip4:129.213.13.252/32]; R_DKIM_ALLOW(-0.20)[rcn.com:s=20180516]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[ports@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[129.213.13.252:from]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:31898, ipnet:129.213.8.0/21, country:US]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[rcn.com:+]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4RySwK70vKz4FpC Hello: On a system running: FreeBSD 14.0-CURRENT #0 main-f0a15aafcb Mon Oct 31 08:19:54 EDT 2022 amd64 I upgrade ports daily using portmaster and a fully populated ports tree, which is updated nightly using "git pull --ff-only". About a week ago, Something Happened(tm) and the contents of www/chromium got mangled to the point they had to completely scrubbed. (The directory and permissions are still intact.) I want to: a) re-pull just the contents of that directory. b) deal with the (git) bookkeeping so I can go back to using the usual update procedure. What is the correct set of commands to do this? (Obviously, not a git guru - I mostly cut-and-pasted stuff from the Handbook and went on to other matters.) Respectfully, Robert Huff