Jonathan Miller
9a5720e8ad
Universal: PR Check / Branch Policy (pull_request) Successful in 1s
Branch Policy Check / Verify merge target (pull_request) Successful in 1s
PR RC Release / Build RC Release (pull_request) Successful in 3s
Universal: PR Check / Validate PR (pull_request) Failing after 6s
Branch Cleanup / Delete merged branch (pull_request) Successful in 1s
Universal: PR Check / Build RC Package (pull_request) Has been cancelled
Full namespace migration: update the Go module path and all import statements from git.mokoconsulting.tech to code.mokoconsulting.tech. Also updates all URL references in templates, workflows, configs, tests, and documentation. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
83 lines
1.8 KiB
Go
83 lines
1.8 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package gitrepo
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"code.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/git/gitcmd"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func prepareRepoDirRenameConflict(t *testing.T) string {
|
|
repoDir := filepath.Join(t.TempDir(), "repo-dir-rename-conflict.git")
|
|
require.NoError(t, gitcmd.NewCommand("init", "--bare").AddDynamicArguments(repoDir).Run(t.Context()))
|
|
stdin := `blob
|
|
mark :1
|
|
data 2
|
|
b
|
|
|
|
blob
|
|
mark :2
|
|
data 2
|
|
c
|
|
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :3
|
|
author test <test@example.com> 1769202331 -0800
|
|
committer test <test@example.com> 1769202331 -0800
|
|
data 2
|
|
O
|
|
M 100644 :1 z/b
|
|
M 100644 :2 z/c
|
|
|
|
commit refs/heads/split
|
|
mark :4
|
|
author test <test@example.com> 1769202336 -0800
|
|
committer test <test@example.com> 1769202336 -0800
|
|
data 2
|
|
A
|
|
from :3
|
|
M 100644 :2 w/c
|
|
M 100644 :1 y/b
|
|
D z/b
|
|
D z/c
|
|
|
|
blob
|
|
mark :5
|
|
data 2
|
|
d
|
|
|
|
commit refs/heads/add
|
|
mark :6
|
|
author test <test@example.com> 1769202342 -0800
|
|
committer test <test@example.com> 1769202342 -0800
|
|
data 2
|
|
B
|
|
from :3
|
|
M 100644 :5 z/d
|
|
`
|
|
require.NoError(t, gitcmd.NewCommand("fast-import").WithDir(repoDir).WithStdinBytes([]byte(stdin)).Run(t.Context()))
|
|
return repoDir
|
|
}
|
|
|
|
func TestMergeTreeDirectoryRenameConflictWithoutFiles(t *testing.T) {
|
|
repoDir := prepareRepoDirRenameConflict(t)
|
|
require.DirExists(t, repoDir)
|
|
repo := &mockRepository{path: repoDir}
|
|
|
|
mergeBase, err := MergeBase(t.Context(), repo, "add", "split")
|
|
require.NoError(t, err)
|
|
|
|
treeID, conflicted, conflictedFiles, err := MergeTree(t.Context(), repo, "add", "split", mergeBase)
|
|
require.NoError(t, err)
|
|
assert.True(t, conflicted)
|
|
assert.Empty(t, conflictedFiles)
|
|
assert.Equal(t, "5e3dd4cfc5b11e278a35b2daa83b7274175e3ab1", treeID)
|
|
}
|