Skip to content

[5.4] Enable symlink support explicitly #3417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2021
Merged

[5.4] Enable symlink support explicitly #3417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f345205
Enable symlink support explicitly (#3406)
stevapple Apr 20, 2021
9487c9b
Limit the change to Windows only
stevapple May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Sources/SourceControl/GitRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,18 @@ public struct GitRepositoryProvider: RepositoryProvider {
// shallow clone.
precondition(!localFileSystem.exists(path))
// FIXME: Ideally we should pass `--progress` here and report status regularly. We currently don't have callbacks for that.
//
// NOTE: Explicitly set `core.symlinks=true` on `git clone` to ensure that symbolic links are correctly resolved.
// FIXME: Remove the judgement before a cross-platform release
#if os(Windows)
try self.callGit("clone", "-c", "core.symlinks=true", "--mirror", repository.url, path.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#else
try self.callGit("clone", "--mirror", repository.url, path.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#endif
}

public func copy(from sourcePath: AbsolutePath, to destinationPath: AbsolutePath) throws {
Expand All @@ -105,9 +114,18 @@ public struct GitRepositoryProvider: RepositoryProvider {
// For editable clones, i.e. the user is expected to directly work on them, first we create
// a clone from our cache of repositories and then we replace the remote to the one originally
// present in the bare repository.
//
// NOTE: Explicitly set `core.symlinks=true` on `git clone` to ensure that symbolic links are correctly resolved.
// FIXME: Remove the judgement before a cross-platform release
#if os(Windows)
try self.callGit("clone", "-c", "core.symlinks=true", "--no-checkout", sourcePath.pathString, destinationPath.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#else
try self.callGit("clone", "--no-checkout", sourcePath.pathString, destinationPath.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#endif
// The default name of the remote.
let origin = "origin"
// In destination repo remove the remote which will be pointing to the source repo.
Expand All @@ -125,9 +143,18 @@ public struct GitRepositoryProvider: RepositoryProvider {
// re-resolve such that the objects in this repository changed, we would
// only ever expect to get back a revision that remains present in the
// object storage.
//
// NOTE: Explicitly set `core.symlinks=true` on `git clone` to ensure that symbolic links are correctly resolved.
// FIXME: Remove the judgement before a cross-platform release
#if os(Windows)
try self.callGit("clone", "-c", "core.symlinks=true", "--shared", "--no-checkout", sourcePath.pathString, destinationPath.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#else
try self.callGit("clone", "--shared", "--no-checkout", sourcePath.pathString, destinationPath.pathString,
repository: repository,
failureMessage: "Failed to clone repository \(repository.url)")
#endif
}
}

Expand Down