diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-07-15 00:44:47 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-07-15 00:44:47 +0300 |
| commit | d21121505316566ea0e4ac92fb3d7c883a8dd97a (patch) | |
| tree | 23272f82ad83ddf25e8956164626a559f77862a0 | |
| parent | b9d5fa28fbbc7e4a9fd831c8827ff41cc8eb219d (diff) | |
| parent | 0be190fb49ea525666c9cbfbd14ce57763196a90 (diff) | |
Merge branch 'fix/tree-entry-empty-response' into 'master'
Send an empty response for TreeEntry instead of nil
See merge request !223
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | internal/service/commit/tree_entry.go | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2131dfd46..174caa306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Gitaly changelog +UNRELEASED +- Send an empty response for TreeEntry instead of nil + https://gitlab.com/gitlab-org/gitaly/merge_requests/223 + v0.20.0 - Implement commit diff limiting logic https://gitlab.com/gitlab-org/gitaly/merge_requests/211 diff --git a/internal/service/commit/tree_entry.go b/internal/service/commit/tree_entry.go index 3b25c74b9..b3637d927 100644 --- a/internal/service/commit/tree_entry.go +++ b/internal/service/commit/tree_entry.go @@ -34,8 +34,7 @@ func treeEntryHandler(stream pb.Commit_TreeEntryServer, revision, path, baseName } if treeEntry == nil || len(treeEntry.Oid) == 0 { - // Not found, send nothing - return nil + return helper.DecorateError(codes.Unavailable, stream.Send(&pb.TreeEntryResponse{})) } if treeEntry.Type == pb.TreeEntry_COMMIT { |