Re: pkgsrc and git

[Paul Ripke <stix%stix.id.au@localhost>]

On Fri, Jul 18, 2025 at 07:02:11PM +0000, John Klos wrote:
> > My first guess is that there was some corruption in your checkout.
> 
> There shouldn't be. This system has had no panics or other unexpected
> restarts, and I just updated it a month ago.
> 
> > The error message is clear: it says that 0ad-data/COMMIT_MSG in your
> > version of the repository is untracked (i.e. not part of the git
> > repository, a new file), but that the changes you pulled from the
> > server include a file at that location, and that the new file would
> > overwrite your unknown one.
> > 
> > In case you were really adding this locally while it was added
> > upstream, you'd need to either move it aside, or commit it locally and
> > merge the changes from upstream with yours.
> 
> I haven't added any files, or changed, or moved. I'm interested in what the
> underlying problem is because if things like this happen to a completely
> untouched wip, it could happen to pkgsrc when pkgsrc is in git, and it'd be
> good to know what the error means and what people should do about it.

'git status' should give you some info on the current state of your tree.
I've found git a bit finicky to deal with, but it seems to work fine - I've
had one corrupted git repo, and that turned out to be due to bad RAM.

> > > At some point a good CVS -> git cheat sheet would be good, including
> > > covering problems and errors.

I've started a couple of personal cheat-sheets, that are public:

- https://www.stix.id.au/wiki/git_help
- https://www.stix.id.au/wiki/git_pull_merge_conflicts

That second one *might* be the situation you're in?

> > cjep started a document for after the conversion:
> > 
> > https://wiki.netbsd.org/users/cjep/git4pkgsrc/
> > 
> > but the server details are of course not filled in yet, since we
> > haven't switched.
> 
> This is a good start (but obviously for different reasons than the issue
> above).
> 
> Thanks!
> John

-- 
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
 discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.