From: Tamir Duberstein <tamird@gmail.com>
To: git@vger.kernel.org
Cc: Tao Klerks <tao@klerks.biz>, Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>, Jeff King <peff@peff.net>,
Tamir Duberstein <tamird@gmail.com>
Subject: [PATCH 1/2] dir: hash ignore files before adding parser LF
Date: Wed, 23 Sep 2026 13:10:08 -0400 [thread overview]
Message-ID: <20260923-ls-files-untracked-cache-v1-1-08db4cc1efdb@gmail.com> (raw)
In-Reply-To: <20260923-ls-files-untracked-cache-v1-0-08db4cc1efdb@gmail.com>
add_patterns() appends a newline for the pattern parser before computing
an ignore file's object ID. Its fallback hash therefore includes a byte
that is absent from the file. The fast path instead copies the original
blob ID from an up-to-date index entry.
Switching between those paths changes the recorded ignore identity even
when the file has not changed, invalidating the untracked cache below it.
Compute the hash before appending the parser newline so both paths agree.
Update the expected identities of the untracked ignore files accordingly.
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
dir.c | 2 +-
t/t7063-status-untracked-cache.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dir.c b/dir.c
index d896e7be4b..037780e556 100644
--- a/dir.c
+++ b/dir.c
@@ -1195,7 +1195,6 @@ static int add_patterns(const char *fname, const char *base, int baselen,
close(fd);
return -1;
}
- buf[size++] = '\n';
close(fd);
if (oid_stat) {
int pos;
@@ -1215,6 +1214,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
fill_stat_data(&oid_stat->stat, &st);
oid_stat->valid = 1;
}
+ buf[size++] = '\n';
}
if (size > PATTERN_MAX_FILE_SIZE) {
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 8929ef481f..10d4850077 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -98,11 +98,11 @@ test_expect_success 'setup' '
: >.git/info/exclude &&
git update-index --untracked-cache &&
test_oid_cache <<-EOF
- root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
- root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
+ root sha1:8510665149157c2bc901848c3e0b746954e9cbd9
+ root sha256:09ef24b38105f396a61ad78d73ba6a18ee3cbd89ce4524b4e13b6c1af191e2d8
- exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
- exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
+ exclude sha1:2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
+ exclude sha256:b83643f4390b339c1b3ff2f5132c99bd4a77687dd321d3f386c25953aa6f1ce4
done sha1:1946f0437f90c5005533cbe1736a6451ca301714
done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
--
2.56.0.rc0.807.ga0c0929ce1.frankengit
next prev parent reply other threads:[~2026-09-23 17:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 17:10 [PATCH 0/2] ls-files: reuse the untracked cache Tamir Duberstein
2026-09-23 17:10 ` Tamir Duberstein [this message]
2026-09-23 17:10 ` [PATCH 2/2] ls-files: reuse cached untracked listings Tamir Duberstein
2026-09-23 18:38 ` [PATCH 0/2] ls-files: reuse the untracked cache Tamir Duberstein
2026-09-23 22:26 ` [PATCH v2 0/3] ls-files: reuse and update " Tamir Duberstein
2026-09-23 22:26 ` [PATCH v2 1/3] dir: hash ignore files before appending newline Tamir Duberstein
2026-09-23 22:26 ` [PATCH v2 2/3] dir: share untracked caches across output modes Tamir Duberstein
2026-09-23 22:27 ` [PATCH v2 3/3] ls-files: use and update the untracked cache Tamir Duberstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260923-ls-files-untracked-cache-v1-1-08db4cc1efdb@gmail.com \
--to=tamird@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=tao@klerks.biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox