diff options
author | James Fargher <proglottis@gmail.com> | 2022-08-04 12:31:42 +0300 |
---|---|---|
committer | James Fargher <proglottis@gmail.com> | 2022-08-04 12:31:42 +0300 |
commit | 3d769a33712796de113fe07647597a63d762c305 (patch) | |
tree | b63e1a3902b43d241395328574a7f93fd4e8c4d1 | |
parent | 5ac494300c839eea0980d118d12ffb51f447c0ac (diff) | |
parent | d2b98cb27126ae2140e8fdc3974d8c204c911686 (diff) |
Merge branch 'wc-macos-localrepo-test' into 'master'
localrepo: Don't run case-sensitive test on macOS
See merge request gitlab-org/gitaly!4773
-rw-r--r-- | internal/git/localrepo/refs_test.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/internal/git/localrepo/refs_test.go b/internal/git/localrepo/refs_test.go index c385a8a50..6da5ee98c 100644 --- a/internal/git/localrepo/refs_test.go +++ b/internal/git/localrepo/refs_test.go @@ -7,6 +7,7 @@ import ( "fmt" "os" "path/filepath" + "runtime" "strings" "testing" @@ -123,7 +124,6 @@ func TestRepo_GetReferenceWithAmbiguousRefs(t *testing.T) { for _, ref := range []git.ReferenceName{ "refs/heads/something/master", - "refs/heads/MASTER", "refs/heads/master2", "refs/heads/masterx", "refs/heads/refs/heads/master", @@ -134,6 +134,11 @@ func TestRepo_GetReferenceWithAmbiguousRefs(t *testing.T) { require.NoError(t, repo.UpdateRef(ctx, ref, prevOID, gittest.DefaultObjectHash.ZeroOID)) } + // core.ignorecase is default-enabled on macOS, causing 'MASTER' to match 'master' + if runtime.GOOS != "darwin" { + require.NoError(t, repo.UpdateRef(ctx, "refs/heads/MASTER", prevOID, gittest.DefaultObjectHash.ZeroOID)) + } + ref, err := repo.GetReference(ctx, "refs/heads/master") require.NoError(t, err) require.Equal(t, git.Reference{ |