From nobody Sat Apr 25 23:48:39 2026
X-Original-To: freebsd-current@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 4g36383N9jz6Zxlx
	for <freebsd-current@mlmmj.nyi.freebsd.org>; Sat, 25 Apr 2026 23:48:20 +0000 (UTC)
	(envelope-from fbsd@www.zefox.net)
Received: from www.zefox.net (www.zefox.net [50.1.20.27])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (2048 bits) client-digest SHA256)
	(Client CN "pelorus.zefox.org", Issuer "pelorus.zefox.org" (not verified))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4g363805GGz49mX
	for <freebsd-current@freebsd.org>; Sat, 25 Apr 2026 23:48:19 +0000 (UTC)
	(envelope-from fbsd@www.zefox.net)
Authentication-Results: mx1.freebsd.org;
	none
Received: from www.zefox.net (localhost [127.0.0.1])
	by www.zefox.net (8.18.1/8.18.1) with ESMTPS id 63PNmd63040481
	(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO);
	Sat, 25 Apr 2026 16:48:39 -0700 (PDT)
	(envelope-from fbsd@www.zefox.net)
Received: (from fbsd@localhost)
	by www.zefox.net (8.18.1/8.18.1/Submit) id 63PNmdHs040480;
	Sat, 25 Apr 2026 16:48:39 -0700 (PDT)
	(envelope-from fbsd)
Date: Sat, 25 Apr 2026 16:48:39 -0700
From: bob prohaska <fbsd@www.zefox.net>
To: Warner Losh <imp@bsdimp.com>
Cc: freebsd-current@freebsd.org
Subject: Re: Git balks at untracked files in zfs
Message-ID: <ae1S18I9fmnMmAY0@www.zefox.net>
References: <ae0A2tmfM9W5fKhO@www.zefox.net>
 <CANCZdfoJBHjdwSnHak3mVMJtTiZjwmzwdf8AQUq+PoG-Xsehdw@mail.gmail.com>
List-Id: Discussions about the use of FreeBSD-current <freebsd-current.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-current
List-Help: <mailto:freebsd-current+help@freebsd.org>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Subscribe: <mailto:freebsd-current+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-current+unsubscribe@freebsd.org>
Sender: owner-freebsd-current@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CANCZdfoJBHjdwSnHak3mVMJtTiZjwmzwdf8AQUq+PoG-Xsehdw@mail.gmail.com>
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:7065, ipnet:50.1.16.0/20, country:US]
X-Rspamd-Queue-Id: 4g363805GGz49mX
X-Spamd-Bar: ----

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