diff options
| author | James Fargher <proglottis@gmail.com> | 2021-07-23 07:44:45 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2021-07-23 07:44:45 +0300 |
| commit | 9e9c5097b3cb44149f82d146a4e404f668f54531 (patch) | |
| tree | d5e32dafa9ddb6de2d2784b0d1ae5c670acf1bd2 | |
| parent | 4b1cd07fee87c241dac99e3e8a40714c90558dce (diff) | |
| parent | ba882c2c9320ba354cd880983eb2f011b3086b4e (diff) | |
Merge branch 'wc-mirror-hardcode-branch' into 'master'
remote: Remove hardcoded branch name from error
See merge request gitlab-org/gitaly!3701
| -rw-r--r-- | internal/gitaly/service/remote/update_remote_mirror.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/remote/update_remote_mirror_test.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index baab1000e..e209c6001 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -199,7 +199,7 @@ func (s *server) updateRemoteMirror(stream gitalypb.RemoteService_UpdateRemoteMi } if _, ok := seen[name]; ok { - return errors.New("close stream to gitaly-ruby: rpc error: code = Unknown desc = Gitlab::Git::CommandError: error: src refspec master matches more than one") + return fmt.Errorf("close stream to gitaly-ruby: rpc error: code = Unknown desc = Gitlab::Git::CommandError: error: src refspec %v matches more than one", reference) } seen[name] = struct{}{} diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 85b9a46ce..9b192c57f 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -192,12 +192,13 @@ func TestUpdateRemoteMirror(t *testing.T) { }, { // https://gitlab.com/gitlab-org/gitaly/-/issues/3504 + // Truncate error as either refs/heads/master or refs/tags/master may be returned desc: "fails if tag and branch named the same", sourceRefs: refs{ "refs/heads/master": {"commit 1"}, "refs/tags/master": {"commit 1"}, }, - errorContains: "rpc error: code = Internal desc = close stream to gitaly-ruby: rpc error: code = Unknown desc = Gitlab::Git::CommandError: error: src refspec master matches more than one", + errorContains: "rpc error: code = Internal desc = close stream to gitaly-ruby: rpc error: code = Unknown desc = Gitlab::Git::CommandError: error: src refspec refs/", }, { desc: "only local branches are considered", |