Skip to content

libs/fileset: cover leading-slash anchoring in glob patterns #6345

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

Open
TangoEnSkai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

libs/fileset: cover leading-slash anchoring in glob patterns #6345

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
31 changes: 31 additions & 0 deletions libs/fileset/glob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package fileset

import (
"io/fs"
"os"
"path"
"path/filepath"
"slices"
"strings"
"testing"
Expand Down Expand Up @@ -132,3 +134,32 @@ func TestGlobFilesetDoubleQuotesWithFilePatterns(t *testing.T) {
require.NoError(t, err)
require.ElementsMatch(t, entries, collectRelativePaths(files))
}

// A pattern with a leading slash is anchored to the fileset root, the same way
// git treats it in .gitignore. Without the slash the pattern matches a directory
// of that name at any depth. sync.include relies on this to select, say, a
// top-level "resources" directory without also picking up "vendor/resources".
func TestGlobFilesetLeadingSlashAnchorsToRoot(t *testing.T) {
tmpDir := t.TempDir()
require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "dir"), 0o755))
require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "nested", "dir"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "dir", "a.txt"), []byte("a"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "nested", "dir", "b.txt"), []byte("b"), 0o644))

root := vfs.MustNew(tmpDir)

g, err := NewGlobSet(root, []string{"/dir/"})
require.NoError(t, err)
files, err := g.Files()
require.NoError(t, err)
require.ElementsMatch(t, []string{filepath.Join("dir", "a.txt")}, collectRelativePaths(files))

g, err = NewGlobSet(root, []string{"dir/"})
require.NoError(t, err)
files, err = g.Files()
require.NoError(t, err)
require.ElementsMatch(t, []string{
filepath.Join("dir", "a.txt"),
filepath.Join("nested", "dir", "b.txt"),
}, collectRelativePaths(files))
}