Date: Thu, 8 Sep 2022 08:46:09 +0000 From: Alexey Dokuchaev <danfe@freebsd.org> To: Stefan E??er <se@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: fb16dfecae4a - main - Remove WWW entries moved into port Makefiles Message-ID: <Yxmr0feAxvbZQtto@FreeBSD.org> In-Reply-To: <0bb68a6f-1e45-4b9c-e0c4-924a2b2a53f8@FreeBSD.org> References: <202209072201.287M1lXD016280@gitrepo.freebsd.org> <YxlwR9lAS1/AsQA2@FreeBSD.org> <0bb68a6f-1e45-4b9c-e0c4-924a2b2a53f8@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Sep 08, 2022 at 09:33:30AM +0200, Stefan E??er wrote:
> Am 08.09.22 um 06:32 schrieb Alexey Dokuchaev:
> > ...
> > I think these huge commits had broken my working tree. This morning
> > I've routinely "git pull"ed (had to move lots of Makefile and pkg-descr
> > files to .wip suffix since it complained), but even then git failed
> > the update: looks like it applied the changes ("git diff" shows tons of
> > -WWW: +WWW= lines) but could not merge the commit? I have just ~1G of
> > free space on this HDD, maybe that was the problem... Now "git fetch"
> > returns 0, so I guess the changes are at my computer, but the HEAD
> > points to 7169e48ef313. How do I manually merge and apply these WWW-
> > related commits on per-category basis? I'd rather do it this way and
> > by hand rather than play with "git reset" as I have lots of uncommitted
> > changes lying around and I don't want to accidentally lose them.
>
> Hi Alexey,
>
> sorry for the issues this update caused for you.
>
> Does the following sequence of commands help:
>
> git stash
> git fetch
> git rebase
> git stash pop
Thanks, this worked (well, almost -- "git diff" is now empty, but at least
my untracked files seem to be in place). I'll try to reapply lost changes
by hand from that 600k-line diff I've saved earlier, with a little help
from grep(1) et al.
./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Yxmr0feAxvbZQtto>