fix(snapshot): respect gitignore for previously tracked files - #22171
Merged
Conversation
Files previously tracked in the snapshot that were later added to .gitignore were still being included in patches. This happened because: 1. diff-files returns tracked files regardless of gitignore status 2. git add was re-adding all files including those now ignored 3. patch() output wasn't filtering out gitignored files The fix: - In add(): Use git check-ignore to identify newly-ignored files and remove them from the snapshot index with git rm --cached - In patch(): Filter out gitignored files from the diff output Added test: files tracked in snapshot but now gitignored are filtered out Fixes issue where files like .android-sdk were re-added to snapshots even after being added to .gitignore.
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.
thdxr
enabled auto-merge (squash)
April 12, 2026 17:41
thdxr
disabled auto-merge
April 12, 2026 17:41
thdxr
added a commit
that referenced
this pull request
Apr 12, 2026
The previous fix (#22171) was incomplete. This adds the missing pieces: 1. --no-index flag to git check-ignore (critical for tracked files) Without --no-index, check-ignore returns exit code 1 for tracked files even if they match gitignore patterns 2. diffFull() filtering - filters gitignored files from diff results when gitignore changes between two track() calls 3. Complete test coverage: - files tracked in snapshot but now gitignored are filtered out - gitignore updated between track calls filters from diff The fix now properly handles the case where a file was: 1. Already in git (committed) 2. Tracked in snapshot 3. Later added to .gitignore Such files will no longer appear in patches or diffs.
alexyaroshuk
pushed a commit
to alexyaroshuk/opencode
that referenced
this pull request
Apr 13, 2026
mrsimpson
pushed a commit
to mrsimpson/opencode
that referenced
this pull request
Apr 14, 2026
sdeonvacation
pushed a commit
to sdeonvacation/opencode-x-old
that referenced
this pull request
Apr 23, 2026
…yco#22171) (cherry picked from commit 113304a)
xywsxp
pushed a commit
to xywsxp/opencode
that referenced
this pull request
Apr 24, 2026
AIALRA-0
pushed a commit
to AIALRA-0/opencode-turn-engine
that referenced
this pull request
Jun 10, 2026
AIALRA-0
pushed a commit
to AIALRA-0/opencode-turn-engine
that referenced
this pull request
Jun 10, 2026
avion23
pushed a commit
to avion23/opencode
that referenced
this pull request
Jun 10, 2026
MarsQiu007
referenced
this pull request
in MarsQiu007/openNovel
Jul 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Files previously tracked in the snapshot that were later added to .gitignore were still being included in patches. This caused scenarios like 22,881 files from .android-sdk being snapshotted even after being added to .gitignore.
Root Cause
diff-filesreturns tracked files regardless of gitignore statusgit addwas re-adding all files including those now ignoredpatch()output wasn't filtering out gitignored filesThe Fix
In
add()function:git check-ignoreagainst the source project's git to identify newly-ignored filesgit rm --cachedbefore adding new filesIn
patch()function:git check-ignoreto filter out any gitignored files from the patch outputTest Added
files tracked in snapshot but now gitignored are filtered out- Verifies that a file was tracked, then gitignored, and no longer appears in patches.Verification
All 52 snapshot tests pass including the new test.