Skip to content

Remove rescue of Gitlab::Git::CommitError at UserMergeToRef RPC

Oswaldo Ferreira requested to merge osw-bubble-up-conflicts-error-to-sentry into master

We've been experiencing transient Gitlab::Git::CommitError that were being rescued at gitaly-ruby. They might be related to conflicts or errors during git update-ref.

This MR removes the rescue and also make the error messages more detailed for further investigation at Sentry.

Ideally we should move the rescuing to the client instead.

Edit: We've noticed it's due to concurrent calls to this RPC.

Further details at #1782 (closed).

Edited by GitLab Release Tools Bot

Merge request reports