Inspect changes in Gitaly 5bdafbc7693c7dfacc1c0932cfa8d62004c7097b
Upstream merge commit af8643ef07bc changes Gitaly server version from e8bd279636709887e70420ef64276022f25724f0 to 5bdafbc7693c7dfacc1c0932cfa8d62004c7097b, with changes in protocol or one of the source subtrees currently under watch.
To further inspect, go to an up to date Gitaly source clone and run
diff e8bd279636709887e70420ef64276022f25724f0..5bdafbc7693c7dfacc1c0932cfa8d62004c7097b -- proto/*.proto internal/backup
. Here is a preview, truncated at 500 lines:
diff --git a/internal/backup/pipeline_test.go b/internal/backup/pipeline_test.go
index b16f658f0..63d2733f7 100644
--- a/internal/backup/pipeline_test.go
+++ b/internal/backup/pipeline_test.go
@@ -7,7 +7,6 @@ import (
"testing"
"time"
- "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
@@ -18,7 +17,7 @@ func TestLoggingPipeline(t *testing.T) {
t.Parallel()
testPipeline(t, func() Pipeline {
- return NewLoggingPipeline(logrus.StandardLogger())
+ return NewLoggingPipeline(testhelper.NewDiscardingLogger(t))
})
}
@@ -26,7 +25,7 @@ func TestParallelPipeline(t *testing.T) {
t.Parallel()
testPipeline(t, func() Pipeline {
- return NewParallelPipeline(NewLoggingPipeline(logrus.StandardLogger()), 2, 0)
+ return NewParallelPipeline(NewLoggingPipeline(testhelper.NewDiscardingLogger(t)), 2, 0)
})
t.Run("parallelism", func(t *testing.T) {
@@ -65,7 +64,7 @@ func TestParallelPipeline(t *testing.T) {
},
}
var p Pipeline
- p = NewLoggingPipeline(logrus.StandardLogger())
+ p = NewLoggingPipeline(testhelper.NewDiscardingLogger(t))
p = NewParallelPipeline(p, tc.parallel, tc.parallelStorage)
ctx := testhelper.Context(t)
@@ -81,7 +80,7 @@ func TestParallelPipeline(t *testing.T) {
t.Run("context done", func(t *testing.T) {
var strategy MockStrategy
var p Pipeline
- p = NewLoggingPipeline(logrus.StandardLogger())
+ p = NewLoggingPipeline(testhelper.NewDiscardingLogger(t))
p = NewParallelPipeline(p, 0, 0) // make sure worker channels always block
ctx, cancel := context.WithCancel(testhelper.Context(t))
A merge request may have already been submitted, check that on [merge commit commit](af8643ef07bc, as usually changes in Gitaly are not breaking, compliance becoming mandatory in the following development cycles.