Trim trailing / in path

2 files changed, 6 insertions, 0 deletions

diff --git a/internal/service/blob/get_blobs.go b/internal/service/blob/get_blobs.go
index 7ead81681..ec588e273 100644
--- a/internal/service/blob/get_blobs.go
+++ b/internal/service/blob/get_blobs.go
@@ -1,6 +1,7 @@
 package blob
 
 import (
+	"bytes"
 	"io"
 	"io/ioutil"
 
@@ -25,6 +26,10 @@ func sendGetBlobsResponse(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobSer
 		revision := revisionPath.Revision
 		path := revisionPath.Path
 
+		if len(path) > 1 {
+			path = bytes.TrimRight(path, "/")
+		}
+
 		treeEntry, err := tef.FindByRevisionAndPath(revision, string(path))
 		if err != nil {
 			return err
diff --git a/internal/service/commit/tree_entry.go b/internal/service/commit/tree_entry.go
index 8498b8436..b7e560d29 100644
--- a/internal/service/commit/tree_entry.go
+++ b/internal/service/commit/tree_entry.go
@@ -115,6 +115,7 @@ func (s *server) TreeEntry(in *gitalypb.TreeEntryRequest, stream gitalypb.Commit
 	}
 
 	c, err := catfile.New(stream.Context(), in.Repository)
+
 	if err != nil {
 		return err
 	}