Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-03-01 14:44:04 +0300
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-03-01 14:44:04 +0300
commit7e4d180fc1e8b6995f5501fca72cde751b752266 (patch)
tree2f2939067695be5317835dd3b85ae571c154d449
parent62211f2a400f5432ad8a49a6a7c6d94652214c69 (diff)
make updatereferror return raw err
-rw-r--r--internal/gitaly/service/operations/update_with_hooks.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/update_with_hooks.go b/internal/gitaly/service/operations/update_with_hooks.go
index e062c86a9..8098722dd 100644
--- a/internal/gitaly/service/operations/update_with_hooks.go
+++ b/internal/gitaly/service/operations/update_with_hooks.go
@@ -25,6 +25,7 @@ func (e preReceiveError) Error() string {
type updateRefError struct {
reference string
+ stderr *bytes.Buffer
}
func (e updateRefError) Error() string {
@@ -108,7 +109,7 @@ func (s *Server) updateReferenceWithHooks(ctx context.Context, repo *gitalypb.Re
}
if err := updater.Wait(); err != nil {
- return updateRefError{reference: reference}
+ return err
}
if err := s.hookManager.PostReceiveHook(ctx, repo, nil, env, strings.NewReader(changes), &stdout, &stderr); err != nil {