Date: Sat, 25 Apr 2026 10:58:50 -0700 From: bob prohaska <fbsd@www.zefox.net> To: freebsd-current@freebsd.org Cc: bob prohaska <fbsd@www.zefox.net> Subject: Git balks at untracked files in zfs Message-ID: <ae0A2tmfM9W5fKhO@www.zefox.net>
index | next in thread | raw e-mail
For the last few git pull sessions git has been reporting error: The following untracked working tree files would be overwritten by merge: share/man/man4/appleir.4 sys/compat/linuxkpi/common/include/linux/hex.h sys/contrib/openzfs/.github/workflows/zfs-arm.yml sys/contrib/openzfs/man/man1/dbufstat.1 sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_change-key/zfs_change-key_userprop.ksh .... and so forth. It looks like all the complaints are about openzfs Runnig git reset --hard appears to clear the error: root@www:/usr/src # git reset --hard HEAD is now at 2b954770ddd nvme: Use passed in max_pages. If I re-run git pull the system reports an update available and fails again: root@www:/usr/src # git pull Updating 2b954770ddd..7f207b6443f error: The following untracked working tree files would be overwritten by merge: share/man/man4/appleir.4 sys/compat/linuxkpi/common/include/linux/hex.h sys/contrib/openzfs/.github/workflows/zfs-arm.yml sys/contrib/openzfs/man/man1/dbufstat.1 sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_change-key/zfs_change-key_userprop.ksh and so forth. It looks like I'm stuck, is there a way to get unstuck? Thanks for reading, bob prohaskahome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ae0A2tmfM9W5fKhO>