Skip to content

Fix issue of gitignore matching parent dir when it shouldn't #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andy1li merged 1 commit into from
Feb 25, 2026
+24 −0
Merged

Fix issue of gitignore matching parent dir when it shouldn't #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/utils/git_ignore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ func NewGitIgnore(baseDir string) GitIgnore {
}

func (i GitIgnore) SkipFile(path string) (bool, error) {
path = strings.TrimPrefix(path, i.baseDir)
path = strings.TrimPrefix(path, "/")

// Never skip the .git directory or files inside it, even if matched by .gitignore patterns.
if path == ".git" ||
strings.HasPrefix(path, ".git/") ||
Expand Down
21 changes: 21 additions & 0 deletions internal/utils/git_ignore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,27 @@ func TestGitIgnore(t *testing.T) {
})
}
})

t.Run("match only paths within baseDir, not its parent directories", func(t *testing.T) {
backup := setupGlobalGitIgnore(t, "var/\nignore.txt\n")
defer func() {
if backup.originalPath == "" {
unsetGlobalGitIgnoreConfig(t)
}
backup.Restore(t)
}()

baseDir := filepath.Join(t.TempDir(), "var", "home", "user", "repo")
err := os.MkdirAll(baseDir, 0755)
assert.NoError(t, err)
writeFile(t, filepath.Join(baseDir, "not-ignore.txt"), "not-ignore")
writeFile(t, filepath.Join(baseDir, "ignore.txt"), "ignore")

gitIgnore := NewGitIgnore(baseDir)

assertFileNotSkipped(t, &gitIgnore, filepath.Join(baseDir, "not-ignore.txt"))
assertFileSkipped(t, &gitIgnore, filepath.Join(baseDir, "ignore.txt"))
})
}

func assertFileSkipped(t *testing.T, gitIgnore *GitIgnore, path string) {
Expand Down