Merge pull request #560 from numtide/feat/git-untracked-files

feat: traverse untracked files in git walker

Author: brianmcgee

cmd/root_test.go

@@ -1359,11 +1359,15 @@ func TestGit(t *testing.T) {
 	as.NoError(gitCmd.Run(), "failed to init git repository")
 
 	// run before adding anything to the index
+	// we should pick up untracked files since we use `git ls-files -o`
 	treefmt(t,
 		withConfig(configPath, cfg),
 		withNoError(t),
 		withStats(t, map[stats.Type]int{
-			stats.Traversed: 0,
+			stats.Traversed: 31,
+			stats.Matched:   31,
+			stats.Formatted: 31,
+			stats.Changed:   0,
 		}),
 	)
 
@@ -1377,14 +1381,13 @@ func TestGit(t *testing.T) {
 		withStats(t, map[stats.Type]int{
 			stats.Traversed: 31,
 			stats.Matched:   31,
-			stats.Formatted: 31,
+			stats.Formatted: 0,
 			stats.Changed:   0,
 		}),
 	)
 
-	// remove python directory from the index
-	gitCmd = exec.Command("git", "rm", "--cached", "python/*")
-	as.NoError(gitCmd.Run(), "failed to remove python directory from the index")
+	// remove python directory
+	as.NoError(os.RemoveAll(filepath.Join(tempDir, "python")), "failed to remove python directory")
 
 	// we should traverse and match against fewer files, but no formatting should occur as no formatting signatures
 	// are impacted
@@ -1411,8 +1414,8 @@ func TestGit(t *testing.T) {
 		withConfig(configPath, cfg),
 		withNoError(t),
 		withStats(t, map[stats.Type]int{
-			stats.Traversed: 79,
-			stats.Matched:   79,
+			stats.Traversed: 76,
+			stats.Matched:   76,
 			stats.Formatted: 49, // the echo formatter should only be applied to the new files
 			stats.Changed:   0,
 		}),

walk/git.go

@@ -38,7 +38,7 @@ func (g *GitReader) Read(ctx context.Context, files []*File) (n int, err error)
 		r, w := io.Pipe()
 
 		// create a command which will execute from the specified sub path within root
-		cmd := exec.Command("git", "ls-files")
+		cmd := exec.Command("git", "ls-files", "--cached", "--others")
 		cmd.Dir = filepath.Join(g.root, g.path)
 		cmd.Stdout = w
 

walk/git_test.go

@@ -29,19 +29,20 @@ func TestGitReader(t *testing.T) {
 	reader, err := walk.NewGitReader(tempDir, "", &statz)
 	as.NoError(err)
 
-	files := make([]*walk.File, 8)
+	files := make([]*walk.File, 32)
 	ctx, cancel := context.WithTimeout(t.Context(), 100*time.Millisecond)
 	n, err := reader.Read(ctx, files)
 
 	cancel()
-	as.Equal(0, n)
+	as.Equal(31, n)
 	as.ErrorIs(err, io.EOF)
 
 	// add everything to the git index
 	cmd = exec.Command("git", "add", ".")
 	cmd.Dir = tempDir
 	as.NoError(cmd.Run(), "failed to add everything to the index")
 
+	statz = stats.New()
 	reader, err = walk.NewGitReader(tempDir, "", &statz)
 	as.NoError(err)