Inspect changes in Gitaly 33ed1b9b4a8407326c5a1e188810526c7f9fcac3
Upstream merge commit c5169576908f changes Gitaly server version from 94a42419e0b56cf05ba233a39ed699b907056809 to 33ed1b9b4a8407326c5a1e188810526c7f9fcac3, 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 94a42419e0b56cf05ba233a39ed699b907056809..33ed1b9b4a8407326c5a1e188810526c7f9fcac3 -- 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 d730c2c93..42094222a 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -177,7 +177,7 @@ func NewManagerLocal(
conns: nil, // Will be removed once the restore operations are part of the Repository interface.
locator: locator,
repositoryFactory: func(ctx context.Context, repo *gitalypb.Repository, server storage.ServerInfo) (Repository, error) {
- localRepo := localrepo.New(storageLocator, gitCmdFactory, catfileCache, repo)
+ localRepo := localrepo.New(logger, storageLocator, gitCmdFactory, catfileCache, repo)
return newLocalRepository(logger, storageLocator, gitCmdFactory, txManager, repoCounter, localRepo), nil
},
diff --git a/internal/backup/repository.go b/internal/backup/repository.go
index 2ef51046a..ca28a8ef3 100644
--- a/internal/backup/repository.go
+++ b/internal/backup/repository.go
@@ -363,7 +363,7 @@ func (r *localRepository) CreateBundle(ctx context.Context, out io.Writer, patte
// Remove removes the repository. Does not return an error if the repository
// cannot be found.
func (r *localRepository) Remove(ctx context.Context) error {
- err := repoutil.Remove(ctx, r.locator, r.txManager, r.repoCounter, r.repo)
+ err := repoutil.Remove(ctx, r.logger, r.locator, r.txManager, r.repoCounter, r.repo)
switch {
case status.Code(err) == codes.NotFound:
return nil
@@ -377,6 +377,7 @@ func (r *localRepository) Remove(ctx context.Context) error {
func (r *localRepository) Create(ctx context.Context, hash git.ObjectHash) error {
if err := repoutil.Create(
ctx,
+ r.logger,
r.locator,
r.gitCmdFactory,
r.txManager,
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.