diff options
| author | David Kim <dkim@gitlab.com> | 2023-10-25 09:00:49 +0300 |
|---|---|---|
| committer | David Kim <dkim@gitlab.com> | 2023-10-31 14:44:36 +0300 |
| commit | 96a7cad9b21fa7a2e80f3ab2d8263d4b8b5a30e6 (patch) | |
| tree | 95607b3d979dd4b093ac091f164bf32734b3c5ca | |
| parent | 826aaabb02b20e0b6f313eb1631b6eb990b0f089 (diff) | |
Handle new files
| -rw-r--r-- | internal/gitaly/service/diff/commit_diff.go | 7 | ||||
| -rw-r--r-- | internal/gitaly/service/diff/commit_diff_test.go | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/internal/gitaly/service/diff/commit_diff.go b/internal/gitaly/service/diff/commit_diff.go index 118924348..7d4298fc4 100644 --- a/internal/gitaly/service/diff/commit_diff.go +++ b/internal/gitaly/service/diff/commit_diff.go @@ -109,7 +109,12 @@ func (s *server) CommitDiff(in *gitalypb.CommitDiffRequest, stream gitalypb.Diff patch := diff.Patch if in.CollapseGenerated && in.CollapseDiffs { - linguistGenerated, err := linguistInstance.IsGenerated(string(diff.FromPath), diff.FromID) + oid := diff.FromID + if diff.FromID == "0000000000000000000000000000000000000000" { + oid = diff.ToID + } + + linguistGenerated, err := linguistInstance.IsGenerated(string(diff.FromPath), oid) if err != nil { return structerr.NewAborted("send: %w", err) } diff --git a/internal/gitaly/service/diff/commit_diff_test.go b/internal/gitaly/service/diff/commit_diff_test.go index 2b8b534ba..b325c536e 100644 --- a/internal/gitaly/service/diff/commit_diff_test.go +++ b/internal/gitaly/service/diff/commit_diff_test.go @@ -1082,6 +1082,7 @@ func TestCommitDiff_collapseGenerated(t *testing.T) { rightCommit := gittest.WriteCommit(t, cfg, repoPath, gittest.WithTreeEntries( gittest.TreeEntry{Path: "abc.txt", Mode: "100644", Content: "new text\n"}, + gittest.TreeEntry{Path: "new-file.md", Mode: "100644", Content: "new file\n"}, )) type diffAttributes struct { @@ -1103,6 +1104,7 @@ func TestCommitDiff_collapseGenerated(t *testing.T) { {path: "abc.go", collapsed: true, generated: true}, {path: "abc.nib", collapsed: true, generated: true}, {path: "abc.txt", collapsed: true, generated: true}, + {path: "new-file.md", collapsed: false, generated: false}, {path: "package-lock.json", collapsed: false, generated: false}, }, }, @@ -1115,6 +1117,7 @@ func TestCommitDiff_collapseGenerated(t *testing.T) { {path: "abc.go", collapsed: false, generated: false}, {path: "abc.nib", collapsed: false, generated: false}, {path: "abc.txt", collapsed: false, generated: false}, + {path: "new-file.md", collapsed: false, generated: false}, {path: "package-lock.json", collapsed: false, generated: false}, }, }, @@ -1127,6 +1130,7 @@ func TestCommitDiff_collapseGenerated(t *testing.T) { {path: "abc.go", collapsed: false, generated: false}, {path: "abc.nib", collapsed: false, generated: false}, {path: "abc.txt", collapsed: false, generated: false}, + {path: "new-file.md", collapsed: false, generated: false}, {path: "package-lock.json", collapsed: false, generated: false}, }, }, |