Merge branch 'revert-c5786dc5' into 'master'

Revert "Change FindTag err when tag not found to NotFound"

See merge request gitlab-org/gitaly!4736

2 files changed, 1 insertions, 13 deletions

diff --git a/internal/gitaly/service/ref/refs.go b/internal/gitaly/service/ref/refs.go
index c8b1ba34d..19e532dc0 100644
--- a/internal/gitaly/service/ref/refs.go
+++ b/internal/gitaly/service/ref/refs.go
@@ -257,7 +257,7 @@ func (s *server) findTag(ctx context.Context, repo git.RepositoryExecutor, tagNa
 			return nil, err
 		}
 	} else {
-		return nil, helper.ErrNotFoundf("no tag found")
+		return nil, errors.New("no tag found")
 	}
 
 	if err = tagCmd.Wait(); err != nil {
diff --git a/internal/gitaly/service/ref/refs_test.go b/internal/gitaly/service/ref/refs_test.go
index 2028563e9..aa4e0faff 100644
--- a/internal/gitaly/service/ref/refs_test.go
+++ b/internal/gitaly/service/ref/refs_test.go
@@ -1212,15 +1212,3 @@ func TestInvalidFindTagRequest(t *testing.T) {
 		})
 	}
 }
-
-func TestNotFoundFindTagRequest(t *testing.T) {
-	t.Parallel()
-
-	ctx := testhelper.Context(t)
-	_, repoProto, _, client := setupRefService(ctx, t)
-
-	rpcRequest := &gitalypb.FindTagRequest{Repository: repoProto, TagName: []byte("not-found")}
-
-	_, err := client.FindTag(ctx, rpcRequest)
-	testhelper.RequireGrpcError(t, err, helper.ErrNotFoundf("no tag found"))
-}