Skip to content

Git designed for AI agents.

operations: UserMergeToRef writes its merge into a quarantine

Federico Elia43de4c61df31
diff --git a/internal/gitaly/service/operations/fanout_removal_test.go b/internal/gitaly/service/operations/fanout_removal_test.go
index 9064eae..c026bec 100644
--- a/internal/gitaly/service/operations/fanout_removal_test.go
+++ b/internal/gitaly/service/operations/fanout_removal_test.go
@@ -99,3 +99,40 @@ index 3742e48..e40a3b9 100644
require.Equal(t, []byte("changed\n"), gittest.Exec(t, cfg, "-C", repoPath, "show", git.DefaultBranch+":file"))
gittest.Exec(t, cfg, "-C", repoPath, "fsck", "--strict")
}
+
+func TestUserMergeToRef_fanOutDirectoryRemoved(t *testing.T) {
+ t.Parallel()
+
+ ctx, cfg, client := setupFanOutRemoval(t)
+
+ repoProto, repoPath := gittest.CreateRepository(t, ctx, cfg)
+ base := gittest.WriteCommit(t, cfg, repoPath, gittest.WithTreeEntries(
+ gittest.TreeEntry{Path: "base", Mode: "100644", Content: "base\n"},
+ ))
+ ours := gittest.WriteCommit(t, cfg, repoPath, gittest.WithBranch(git.DefaultBranch), gittest.WithParents(base), gittest.WithTreeEntries(
+ gittest.TreeEntry{Path: "base", Mode: "100644", Content: "base\n"},
+ gittest.TreeEntry{Path: "ours", Mode: "100644", Content: "ours\n"},
+ ))
+ theirs := gittest.WriteCommit(t, cfg, repoPath, gittest.WithBranch("theirs"), gittest.WithParents(base), gittest.WithTreeEntries(
+ gittest.TreeEntry{Path: "base", Mode: "100644", Content: "base\n"},
+ gittest.TreeEntry{Path: "theirs", Mode: "100644", Content: "theirs\n"},
+ ))
+ packWithoutFanOut(t, cfg, repoPath)
+
+ response, err := client.UserMergeToRef(ctx, &gitalypb.UserMergeToRefRequest{
+ Repository: repoProto,
+ User: gittest.TestUser,
+ FirstParentRef: []byte("refs/heads/" + git.DefaultBranch),
+ TargetRef: []byte("refs/merge-requests/1/merge"),
+ SourceSha: theirs.String(),
+ Message: []byte("merge"),
+ })
+ require.NoError(t, err)
+
+ repo := localrepo.NewTestRepo(t, cfg, repoProto)
+ merged, err := repo.ReadCommit(ctx, git.Revision("refs/merge-requests/1/merge"))
+ require.NoError(t, err)
+ require.Equal(t, response.GetCommitId(), merged.GetId())
+ require.Equal(t, []string{ours.String(), theirs.String()}, merged.GetParentIds())
+ gittest.Exec(t, cfg, "-C", repoPath, "fsck", "--strict")
+}
diff --git a/internal/gitaly/service/operations/merge_to_ref.go b/internal/gitaly/service/operations/merge_to_ref.go
index e935540..46d6daa 100644
--- a/internal/gitaly/service/operations/merge_to_ref.go
+++ b/internal/gitaly/service/operations/merge_to_ref.go
@@ -91,9 +91,18 @@ func (s *Server) UserMergeToRef(ctx context.Context, request *gitalypb.UserMerge
return nil, structerr.NewInternal("could not read target reference: %w", err)
}
+ // The merge is written into a quarantine, migrated before the reference update: a loose object
+ // written straight into the repository would race housekeeping's removal of empty loose object
+ // directories, which the migration survives.
+ quarantineDir, quarantineRepo, cleanup, err := s.quarantinedRepo(ctx, request.GetRepository())
+ if err != nil {
+ return nil, err
+ }
+ defer cleanup()
+
mergeCommitID, err := s.merge(
ctx,
- repo,
+ quarantineRepo,
authorSignature,
authorSignature,
string(request.GetMessage()),
@@ -149,6 +158,10 @@ func (s *Server) UserMergeToRef(ctx context.Context, request *gitalypb.UserMerge
return nil, err
}
+ if err := quarantineDir.Migrate(ctx); err != nil {
+ return nil, structerr.NewInternal("migrating quarantined objects: %w", err)
+ }
+
if err := repo.UpdateRef(ctx, git.ReferenceName(request.GetTargetRef()), mergeOID, oldTargetOID); err != nil {
return nil, structerr.NewFailedPrecondition("Could not update %s. Please refresh and try again", string(request.GetTargetRef()))
}