From nobody Sat Apr 25 18:50:51 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 4g2zSC6H0lz6NMp8 for ; Sat, 25 Apr 2026 18:51:07 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-dl1-x1232.google.com (mail-dl1-x1232.google.com [IPv6:2607:f8b0:4864:20::1232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2zSC2cFDz3Zqr for ; Sat, 25 Apr 2026 18:51:07 +0000 (UTC) (envelope-from bakul@iitbombay.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-dl1-x1232.google.com with SMTP id a92af1059eb24-12dc1c0b724so112043c88.1 for ; Sat, 25 Apr 2026 11:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay.org; s=google; t=1777143063; x=1777747863; darn=freebsd.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=WRAiJHDxb0ZVe2MQkEyIAWYXgVORyQHMQXLA6r827DA=; b=VD48Y1l18mx0YA8Klw7cduY9gj9RyMtJZgK5UAeRXnQSv0gucpTAdw7k/Lyaa+tiwY zbbU32xxVr7GKikmS6KY/yCJxwc21Z8iwYJIe18TKh76r8mNYd0slJcHAImLR7oUJ6EK lOGN+bCSz7Mpop3+kwF/xhJ8vQie5jdfbmk/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777143063; x=1777747863; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WRAiJHDxb0ZVe2MQkEyIAWYXgVORyQHMQXLA6r827DA=; b=cJKxIXvv+7ujWTfaFjoQayLCgB8LHB2etGJlWgQ5TUaFEcgMEAV3p2wAK6BvsYhxWO BYZreicSPVBudCSsAm+saDyHn/tfVdoJRpfZLvLfaEpd8vKBy9+ADnn0tN7P9FtIRnSq 6cJCNznAZsMlAaVZZZQbOTtDO29iUJ+L15XSCvo+k1otbT44uIFyIxYdh8zkdVXcnlI+ aGK/VY4tdyNF5L8163dCQOa2gnkUUz6roGmAg+mz2MwAJKC+H9YGnskPpAdZffhrc2Bx av4g211WLIhHKtdJcRztn8FUV5yNyFoSAKY87Sup7S9eSbhKEf4CVwjpn4jN71GwD+9W RKGA== X-Forwarded-Encrypted: i=1; AFNElJ+nTvt9ik9erYwRoIiYBoeJhXCjGd3uMMSjynevQwtVJqGaIXIZTKNIYUYaJ8IMs8SEYE8nO98kpnt/dQvtX5s=@freebsd.org X-Gm-Message-State: AOJu0Yw26oQvRpLh9+yRnFBZ8hrQpGSPgg/eSNStXh+1CJScvmyvSs7D sMWcqzVBH88qToVd5UVdxlQgNRQ9dgs4JxEN8OHzHk5FsenvPU67v24JQnQn2hnjAJmAUwohwDM Ta1A= X-Gm-Gg: AeBDieuXcPCZYkdBjb7p2hF2C61u4Vko+Q4Pm0AnOupD0Uj94hGDXr+egX6VJ16b4Rz vTZ0Ne9wD1h9YDLh5XypahOU54vAK93802SKCrngxN25B33GJUmMj//tE16ciusPlHuBPdCj3FU +PWdxpPC6/k6A2vNKlXDRpuf6zC/pRj8+w3R4rbKJOIXDjG7pblNLvYpAvC4B/iKIn7b3sHbVwm sPUAaRtjD1FXuRNf8TFBTLIIbr4nYUG7Nbg9Yza0tW3tLENU0AwcTXqzfBIR0XsDJZbCKNZLBvp IqFyxndmGUrWwyJ1wHm5oiPTLMutvkNH4PXYzdeETmuCgwiZySvEiO5chqWyFPGx9C6sLPOWpLt 6wLa6MhHaF9gUs4bArxQXYooIetpQlFzeaFWgWAf4EkteUJ2wtwxU3dHn/y8cJu2ljMJrGsWigW oVeFa6ijvhZYCncqA4i2SFee3ofHTHFnDcLg+d+j1j+fgv2mcA0fDGPWd89bB589C4YIjzddiCT RsHDpkXkiyG/SvR7sH0BIdGnBrotWSW8wd4UJ9X8lvc X-Received: by 2002:a05:7022:6988:b0:12c:8862:368d with SMTP id a92af1059eb24-12c8862379fmr4830298c88.4.1777143063293; Sat, 25 Apr 2026 11:51:03 -0700 (PDT) Received: from smtpclient.apple (107-215-223-229.lightspeed.sntcca.sbcglobal.net. [107.215.223.229]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12dca2c1c16sm6413062c88.5.2026.04.25.11.51.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Apr 2026 11:51:02 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.500.181\)) Subject: Re: Git balks at untracked files in zfs From: Bakul Shah In-Reply-To: Date: Sat, 25 Apr 2026 11:50:51 -0700 Cc: bob prohaska , FreeBSD Current Content-Transfer-Encoding: quoted-printable Message-Id: References: To: Warner Losh X-Mailer: Apple Mail (2.3864.500.181) 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:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4g2zSC2cFDz3Zqr X-Spamd-Bar: ---- git clean -x will remove even more gunk. git -xn to see what. > On Apr 25, 2026, at 11:44=E2=80=AFAM, Warner Losh = wrote: >=20 > So first off, do you have files you want to keep? If not, then read = on. >=20 > On Sat, Apr 25, 2026 at 11:58=E2=80=AFAM bob prohaska = wrote: > 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-k= ey/zfs_change-key_userprop.ksh > .... and so forth. It looks like all the complaints are about openzfs >=20 > 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. >=20 > 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-k= ey/zfs_change-key_userprop.ksh > and so forth. >=20 > It looks like I'm stuck, is there a way to get unstuck? >=20 > git clean -dn >=20 > this will give you a list of files that will be deleted, updated, etc. = If the list looks good then >=20 > git clean -f > or > git clean -i >=20 > The former blows everything from the prior step away. The latter asks = one by one. If this is supposed to > be a completely clean tree, you can start here. If you have like a = kernel config or something, then you'll > want to proceed with caution. >=20 > Warner > Thanks for reading, >=20 > bob prohaska >=20 >=20