Function gitOctopusMergeWithPatches

core/changeset.go:1208–1247

(
	ctx context.Context,
	base dagql.ObjectResult[*Directory],
	ourPatch *File,
	otherPatches []*File,
)

}

func gitOctopusMergeWithPatches(
	ctx context.Context,
	base dagql.ObjectResult[*Directory],
	ourPatch *File,
	otherPatches []*File,
) (*Directory, error) {
	return withGitMergeWorkspace(ctx, base, "Changeset.withChangesets git octopus merge", func(workDir string) error {
		if err := initGitRepo(ctx, workDir); err != nil {
			return err
		}
		if err := createBranchWithPatchFile(ctx, workDir, "ours", ourPatch); err != nil {
			return err
		}

		branchNames := make([]string, len(otherPatches))
		for i, patch := range otherPatches {
			branchName := fmt.Sprintf("branch_%d", i)
			branchNames[i] = branchName
			if err := createBranchWithPatchFile(ctx, workDir, branchName, patch, "HEAD~1"); err != nil {
				return err
			}
		}

		if err := runGit(ctx, workDir, "checkout", "ours"); err != nil {
			return err
		}

		mergeArgs := []string{"merge", "--no-edit", "--no-commit"}
		mergeArgs = append(mergeArgs, branchNames...)

		if err := runGit(ctx, workDir, mergeArgs...); err != nil {
			return err
		}

		if err := os.RemoveAll(filepath.Join(workDir, ".git")); err != nil {
			return fmt.Errorf("remove temporary octopus merge git repository: %w", err)
		}
		return nil
	})
}

var gitEphemeralConfig = []string{
	// These repositories are disposable. Detached maintenance can outlive the