validate local repository has the correct remote #7079
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tomerd
changed the title
|
@MaxDesiatov @neonichu @shahmishal this would now emit warnings in the edge case we ran into where the local repositories in .build became invalid |
shahmishal
reviewed
Nov 10, 2023
| @@ -210,6 +210,11 @@ public struct GitRepositoryProvider: RepositoryProvider, Cancellable { | |||
| return result == ".git" || result == "." || result == directory.pathString | |||
| } | |||
|
|
|||
| public func isValidDirectory(_ directory: Basics.AbsolutePath, for repository: RepositorySpecifier) throws -> Bool { | |||
| let remoteURL = try self.git.run(["-C", directory.pathString, "remote", "get-url", "origin"]) | |||
There was a problem hiding this comment.
will the remote always be origin? (just wondering)
There was a problem hiding this comment.
yes iiuc, in this case it us the one that SwiftPM sets
motivation: in some edge cases, the local repository may be partially valid (the containing directory is a legit git repo, but the repository diretory is not), or otherwise point to a remote different than the one expected changes: * validate that the local reposiotry remote aligns with the expected one, not just that the directory is a valid git repo * refactor validation flow to be more streamlined
tomerd
force-pushed
the
git-remote-validation
branch
from
9da2275 to
601fbd2
Compare
MaxDesiatov
reviewed
Nov 10, 2023
neonichu
approved these changes
Nov 10, 2023
|
yea i am planning to add a test |
|
@swift-ci test |
|
@swift-ci test windows |
|
@neonichu based on our discussion yesterday, is this good to go? |
|
Yah, I think so. |
auto-merge was automatically disabled
November 27, 2023 04:49
Base branch was modified
tomerd
added a commit
to tomerd/swift-package-manager
that referenced
this pull request
Nov 30, 2023
motivation: in some edge cases, the local repository may be partially valid (the containing directory is a legit git repo, but the repository directory is not), or otherwise point to a remote different than the one expected changes: * validate that the local repository remote aligns with the expected one, not just that the directory is a valid git repo * refactor validation flow to be more streamlined
tomerd
added a commit
that referenced
this pull request
Dec 1, 2023
motivation: in some edge cases, the local repository may be partially valid (the containing directory is a legit git repo, but the repository directory is not), or otherwise point to a remote different than the one expected changes: * validate that the local repository remote aligns with the expected one, not just that the directory is a valid git repo * refactor validation flow to be more streamlined
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
motivation: in some edge cases, the local repository may be partially valid (the containing directory is a legit git repo, but the repository directory is not), or otherwise point to a remote different than the one expected
changes: