diff options
| author | David Kim <dkim@gitlab.com> | 2023-10-31 14:12:45 +0300 |
|---|---|---|
| committer | David Kim <dkim@gitlab.com> | 2023-10-31 14:44:36 +0300 |
| commit | c4ac18ed82f0a2043a5420d050d9145c9778c600 (patch) | |
| tree | 87fac9b34f84e1b39b32227e5eeadb94b28cac02 | |
| parent | e1d91ad33303a4df263fff817a128dc90898a0ab (diff) | |
Use proper ZeroOID check
| -rw-r--r-- | internal/gitaly/service/diff/commit_diff.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/diff/commit_diff.go b/internal/gitaly/service/diff/commit_diff.go index 7d4298fc4..23518ceec 100644 --- a/internal/gitaly/service/diff/commit_diff.go +++ b/internal/gitaly/service/diff/commit_diff.go @@ -109,9 +109,9 @@ func (s *server) CommitDiff(in *gitalypb.CommitDiffRequest, stream gitalypb.Diff patch := diff.Patch if in.CollapseGenerated && in.CollapseDiffs { - oid := diff.FromID - if diff.FromID == "0000000000000000000000000000000000000000" { - oid = diff.ToID + oid := git.ObjectID(diff.FromID) + if objectHash.IsZeroOID(oid) { + oid = git.ObjectID(diff.ToID) } linguistGenerated, err := linguistInstance.IsGenerated(string(diff.FromPath), oid) |