Merge branch 'zj-catch-commit-error-user-rebase' into 'master'

Catch CommitErrors while rebasing

Closes #1137

See merge request gitlab-org/gitaly!680

2 files changed, 13 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a437ee515..2d76c573e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Gitaly changelog
 
+UNRELEASED
+
+- Catch CommitErrors while rebasing
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/680
+
 v0.97.0
 
 - Use gitaly-proto 0.97.0
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index 81a7c92a9..db634e8b5 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -52,6 +52,8 @@ module GitalyServer
           Gitaly::UserDeleteTagResponse.new
         rescue Gitlab::Git::HooksService::PreReceiveError => e
           Gitaly::UserDeleteTagResponse.new(pre_receive_error: set_utf8!(e.message))
+        rescue Gitlab::Git::CommitError => e
+          raise GRPC::FailedPrecondition.new(e)
         end
       end
     end
@@ -93,6 +95,8 @@ module GitalyServer
           Gitaly::UserDeleteBranchResponse.new
         rescue Gitlab::Git::HooksService::PreReceiveError => e
           Gitaly::UserDeleteBranchResponse.new(pre_receive_error: set_utf8!(e.message))
+        rescue Gitlab::Git::CommitError => e
+          raise GRPC::FailedPrecondition.new(e)
         end
       end
     end
@@ -221,6 +225,8 @@ module GitalyServer
           return Gitaly::UserRebaseResponse.new(pre_receive_error: set_utf8!(e.message))
         rescue Gitlab::Git::Repository::GitError => e
           return Gitaly::UserRebaseResponse.new(git_error: set_utf8!(e.message))
+        rescue Gitlab::Git::CommitError => e
+          raise GRPC::FailedPrecondition.new(e.message)
         end
       end
     end
@@ -253,6 +259,8 @@ module GitalyServer
           Gitaly::UserCommitFilesResponse.new(index_error: set_utf8!(e.message))
         rescue Gitlab::Git::HooksService::PreReceiveError => e
           Gitaly::UserCommitFilesResponse.new(pre_receive_error: set_utf8!(e.message))
+        rescue Gitlab::Git::CommitError => e
+          raise GRPC::FailedPrecondition.new(e.message)
         end
       end
     end