Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/service/repository/create_repository_from_snapshot_test.go')
-rw-r--r--internal/gitaly/service/repository/create_repository_from_snapshot_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go
index 416d0b731..deacb432e 100644
--- a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go
+++ b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go
@@ -16,6 +16,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/darwin"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/archive"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
@@ -58,7 +59,7 @@ func (h *tarTesthandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Create a tar file for the repo in memory, without relying on TarBuilder
func generateTarFile(t *testing.T, path string) ([]byte, []string) {
var data []byte
- if runtime.GOOS == "darwin" {
+ if runtime.GOOS == "darwin" && darwin.MajorVersion() < 13 {
data = testhelper.MustRunCommand(t, nil, "tar", "-C", path, "--no-mac-metadata", "-cf", "-", ".")
} else {
data = testhelper.MustRunCommand(t, nil, "tar", "-C", path, "-cf", "-", ".")