Inspect changes in Gitaly 9171724863b73d3e98c1b2021a6095a58ac128e1
Upstream merge commit 7f283741f5aa changes Gitaly server version from c0b07ba36fc8fc40830f061cb55a5c951a166e1c to 9171724863b73d3e98c1b2021a6095a58ac128e1, 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:
git diff c0b07ba36fc8fc40830f061cb55a5c951a166e1c..9171724863b73d3e98c1b2021a6095a58ac128e1 -- proto/*.proto internal/backup
Here is a preview, truncated at 500 lines:
diff --git a/internal/backup/backup.go b/internal/backup/backup.go
index 4b05c9aba..5eed0724a 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -445,7 +445,7 @@ func (mgr *Manager) negatedKnownRefs(ctx context.Context, step *Step) (io.ReadCl
for {
var ref git.Reference
- if err := d.Decode(&ref); err == io.EOF {
+ if err := d.Decode(&ref); errors.Is(err, io.EOF) {
break
} else if err != nil {
_ = w.CloseWithError(err)
@@ -475,7 +475,7 @@ func (mgr *Manager) readRefs(ctx context.Context, path string) ([]git.Reference,
for {
var ref git.Reference
- if err := d.Decode(&ref); err == io.EOF {
+ if err := d.Decode(&ref); errors.Is(err, io.EOF) {
break
} else if err != nil {
return refs, fmt.Errorf("read refs: %w", err)
diff --git a/internal/backup/sink_test.go b/internal/backup/sink_test.go
index 9ff6f3f8a..5eb337147 100644
--- a/internal/backup/sink_test.go
+++ b/internal/backup/sink_test.go
@@ -2,6 +2,7 @@ package backup
import (
"bytes"
+ "errors"
"fmt"
"io"
"os"
@@ -24,8 +25,8 @@ func TestResolveSink(t *testing.T) {
sssink, ok := sink.(*StorageServiceSink)
require.True(t, ok)
_, err := sssink.bucket.List(nil).Next(ctx)
- ierr, ok := err.(interface{ Unwrap() error })
- require.True(t, ok)
+ var ierr interface{ Unwrap() error }
+ require.True(t, errors.As(err, &ierr))
terr := ierr.Unwrap()
require.Contains(t, terr.Error(), expErrMsg)
}
diff --git a/proto/repository.proto b/proto/repository.proto
index 0445ce3a4..25d446f61 100644
--- a/proto/repository.proto
+++ b/proto/repository.proto
@@ -511,10 +511,6 @@ message ObjectsSizeRequest {
// revisions is the set of revisions that shall be used to compute the object size for. Supports normal revisions as
// well as pseudo-revisions like `--not`, `--all`, `--branches[=pattern]`, `--tags[=pattern]` and `--glob=pattern`.
// Please refer to the man pages gitrevisions(7) as well as git-rev-list(1) for more information.
- //
- // Note: due to a restriction in Git v2.41 and older all arguments need to be passed via command line parameters. So
- // even though you can send multiple requests, the actual number of revisions that can be passed is limited by the
- // maximum command line length. This limitation will be lifted once Gitaly has upgraded to Git v2.42 and later.
repeated bytes revisions = 2;
}
A merge request may have already been submitted, check that on the merge commit, as usually changes in Gitaly are not breaking, compliance becoming mandatory in the following development cycles.