diff options
Diffstat (limited to 'internal/gitaly/service/operations/squash.go')
| -rw-r--r-- | internal/gitaly/service/operations/squash.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index b4bc3f644..4a942a15e 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -251,6 +251,10 @@ func (s *Server) userSquash(ctx context.Context, req *gitalypb.UserSquashRequest treeID.String(), }, }, git.WithStdout(&stdout), git.WithStderr(&stderr), git.WithEnv(commitEnv...)); err != nil { + if featureflag.UserSquashImprovedErrorHandling.IsEnabled(ctx) { + return "", helper.ErrInternalf("creating squashed commit: %w", err) + } + return "", fmt.Errorf("creating commit: %w", gitError{ Err: err, ErrMsg: stderr.String(), |