Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Sep 2023 09:46:52 -0400
From:      Michael Butler <imb@protected-networks.net>
To:        Robert Huff <roberthuff@rcn.com>, ports@freebsd.org
Subject:   Re: quick git question
Message-ID:  <4cc0a474-d3a3-454e-87cd-d9d0de649c63@protected-networks.net>
In-Reply-To: <25880.9424.185373.229455@jerusalem.litteratus.org>
References:  <25880.9424.185373.229455@jerusalem.litteratus.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 9/30/23 09:38, Robert Huff wrote:
> 
> 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.)

cd /usr/ports/www/chromium
rm -rf *
git restore .

  .. will likely get you back to consistency.

You may also wish to check the output of ..

cd /usr/ports
git status
git diff

  .. for any wider scale issues,

	Michael




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4cc0a474-d3a3-454e-87cd-d9d0de649c63>