Re: Git balks at untracked files in zfs

On Sat, Apr 25, 2026 at 12:44:13PM -0600, Warner Losh wrote:
> So first off, do you have files you want to keep? If not, then read on.
> 
Yes, but only two and they can be patched again.
 

> 
> git clean -f
> or
> git clean -i
> 
After opting for git clean -f the problem persisted.

root@www:/usr/src #  git status
On branch main
Your branch is behind 'origin/main' by 518 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	sys/contrib/openzfs/tests/zfs-tests/tests/functional/zoned_uid/
	sys/modules/hid/appleir/


Removing those subtrees manually seems to have finally done the job.

Thanks for your help!

bob prohaska