From c3fd72354dddb06cef05189d20f093bb47800c34 Mon Sep 17 00:00:00 2001
From: Lukasz Mierzwa <lukasz@cloudflare.com>
Date: Mon, 24 Jun 2024 13:05:38 +0100
Subject: [PATCH] Remove a FIXME

---
 internal/git/changes.go      |  3 +-
 internal/git/changes_test.go | 57 ++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/internal/git/changes.go b/internal/git/changes.go
index c328ff65..d536d366 100644
--- a/internal/git/changes.go
+++ b/internal/git/changes.go
@@ -103,8 +103,7 @@ func Changes(cmd CommandRunner, baseBranch string, filter PathFilter) ([]*FileCh
 			continue
 		}
 
-		// ignore directories
-		// FIXME move all files instead?
+		// This should never really happen since git doesn't track directories, only files.
 		if isDir, _ := isDirectoryPath(dstPath); isDir {
 			slog.Debug("Skipping directory entry change", slog.String("path", dstPath))
 			continue
diff --git a/internal/git/changes_test.go b/internal/git/changes_test.go
index b6ff4a3b..ad9dd564 100644
--- a/internal/git/changes_test.go
+++ b/internal/git/changes_test.go
@@ -589,6 +589,63 @@ func TestChanges(t *testing.T) {
 			},
 			err: "",
 		},
+		{
+			title: "directory_renamed",
+			setup: func(t *testing.T) git.CommandRunner {
+				mustRun(t, "init", "--initial-branch=main", ".")
+				require.NoError(t, os.Mkdir("dir1", 0o755))
+				require.NoError(t, os.Mkdir("dir1/rules", 0o755))
+				require.NoError(t, os.WriteFile("dir1/rules/file1.txt", []byte("a1\na2\na3\n"), 0o644))
+				require.NoError(t, os.WriteFile("dir1/rules/file2.txt", []byte("b1\nb2"), 0o644))
+				mustRun(t, "add", "dir1")
+				gitCommit(t, "init")
+
+				mustRun(t, "checkout", "-b", "v1")
+				mustRun(t, "mv", "dir1", "dir2")
+				gitCommit(t, "rename")
+
+				return debugGitRun(t)
+			},
+			changes: []*git.FileChange{
+				{
+					Commits: []string{"1"},
+					Path: git.PathDiff{
+						Before: git.Path{
+							Name: "dir1/rules/file1.txt",
+							Type: git.File,
+						},
+						After: git.Path{
+							Name: "dir2/rules/file1.txt",
+							Type: git.File,
+						},
+					},
+					Body: git.BodyDiff{
+						Before:        []byte("a1\na2\na3\n"),
+						After:         []byte("a1\na2\na3\n"),
+						ModifiedLines: []int{1, 2, 3},
+					},
+				},
+				{
+					Commits: []string{"1"},
+					Path: git.PathDiff{
+						Before: git.Path{
+							Name: "dir1/rules/file2.txt",
+							Type: git.File,
+						},
+						After: git.Path{
+							Name: "dir2/rules/file2.txt",
+							Type: git.File,
+						},
+					},
+					Body: git.BodyDiff{
+						Before:        []byte("b1\nb2"),
+						After:         []byte("b1\nb2"),
+						ModifiedLines: []int{1, 2},
+					},
+				},
+			},
+			err: "",
+		},
 	}
 
 	for _, tc := range testCases {