diff options
Diffstat (limited to 'internal/gitaly/service/operations/squash_test.go')
-rw-r--r-- | internal/gitaly/service/operations/squash_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 668503535..d0b111215 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -520,7 +520,7 @@ func testUserSquashConflicts(t *testing.T, ctx context.Context) { if featureflag.UserSquashImprovedErrorHandling.IsEnabled(ctx) { testhelper.RequireGrpcError(t, errWithDetails(t, - helper.ErrInternalf("rebasing commits: rebase: commit %q: there are conflicting files", ours), + helper.ErrFailedPreconditionf("rebasing commits: rebase: commit %q: there are conflicting files", ours), &gitalypb.UserSquashError{ Error: &gitalypb.UserSquashError_RebaseConflict{ RebaseConflict: &gitalypb.MergeConflictError{ |