From nobody Sat Aug 13 09:54:22 2022
X-Original-To: freebsd-git@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 4M4bVZ3g45z4YT9L
	for <freebsd-git@mlmmj.nyi.freebsd.org>; Sat, 13 Aug 2022 09:54:30 +0000 (UTC)
	(envelope-from pi@freebsd.org)
Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4])
	(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 did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 4M4bVY6L0gz3TX2
	for <freebsd-git@freebsd.org>; Sat, 13 Aug 2022 09:54:29 +0000 (UTC)
	(envelope-from pi@freebsd.org)
Received: from pi by fc.opsec.eu with local (Exim 4.95 (FreeBSD))
	(envelope-from <pi@freebsd.org>)
	id 1oMnqY-000BTN-Bn
	for freebsd-git@freebsd.org;
	Sat, 13 Aug 2022 11:54:22 +0200
Date: Sat, 13 Aug 2022 11:54:22 +0200
From: Kurt Jaeger <pi@freebsd.org>
To: freebsd-git@freebsd.org
Subject: git wants to commit more files than expected ?
Message-ID: <Yvd0ziIpQpZTjVyd@fc.opsec.eu>
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
Sender: owner-freebsd-git@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Rspamd-Queue-Id: 4M4bVY6L0gz3TX2
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org;
	dkim=none;
	dmarc=none;
	spf=softfail (mx1.freebsd.org: 2001:14f8:200:4::4 is neither permitted nor denied by domain of pi@freebsd.org) smtp.mailfrom=pi@freebsd.org
X-Spamd-Result: default: False [-2.10 / 15.00];
	SUBJECT_ENDS_QUESTION(1.00)[];
	NEURAL_HAM_LONG(-1.00)[-1.000];
	NEURAL_HAM_MEDIUM(-1.00)[-1.000];
	NEURAL_HAM_SHORT(-1.00)[-1.000];
	MIME_GOOD(-0.10)[text/plain];
	MLMMJ_DEST(0.00)[freebsd-git@freebsd.org];
	ARC_NA(0.00)[];
	FROM_EQ_ENVFROM(0.00)[];
	R_DKIM_NA(0.00)[];
	RCVD_TLS_LAST(0.00)[];
	ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE];
	RCPT_COUNT_ONE(0.00)[1];
	R_SPF_SOFTFAIL(0.00)[~all:c];
	DMARC_NA(0.00)[freebsd.org];
	FREEFALL_USER(0.00)[pi];
	RCVD_COUNT_TWO(0.00)[2];
	MIME_TRACE(0.00)[0:+];
	FROM_HAS_DN(0.00)[];
	TO_DN_NONE(0.00)[];
	TO_MATCH_ENVRCPT_ALL(0.00)[];
	TO_DOM_EQ_FROM_DOM(0.00)[]
X-ThisMailContainsUnwantedMimeParts: N

Hi!

I'm trying to commit the fix from

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265060

and run into trouble. I have a probably pristine git repo:

$ git remote -v
freebsd https://git.freebsd.org/ports.git (fetch)
freebsd https://git.freebsd.org/ports.git (push)

$ git status 
On branch main
Your branch is up to date with 'freebsd/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   archivers/py-borgbackup/Makefile
        new file:   archivers/py-borgbackup/files/patch-setup.py

But if I run a git commit, additional two files turn up:

# Changes to be committed:
#       modified:   archivers/py-borgbackup/Makefile
#       new file:   archivers/py-borgbackup/files/patch-setup.py
#       modified:   print/pdf-tools/Makefile
#       modified:   print/pdf-tools/distinfo

Why isn't git status not reporting the two pdf-tools files,
but git commit is ?

How do I get rid of the two pdf-tools changes ? I'm not aware that I ever
changed those files!

-- 
pi@FreeBSD.org         +49 171 3101372                  Now what ?