Fix the way to compute the target path relative to the symlink #245
Conversation
This file contains 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
ola-rozenfeld
approved these changes
Nov 20, 2020
|
One sec, let me add some test.. |
Done |
k-ye
commented
Nov 20, 2020
| @@ -692,28 +697,27 @@ func TestComputeMerkleTree(t *testing.T) { | |||
| input: []*inputPath{ | |||
| {path: "foobarDir/foo", fileContents: fooBlob, isExecutable: true}, | |||
| {path: "foobarDir/bar", fileContents: barBlob}, | |||
| {path: "foobarSymDir", isSymlink: true, isAbsolute: true, symlinkTarget: "foobarDir"}, | |||
| {path: "base/foobarSymDir", isSymlink: true, isAbsolute: true, symlinkTarget: "foobarDir"}, | |||
There was a problem hiding this comment.
This might seem like it should be ../foobarDir, but because isAbsolute is true, the actual target it generates is "${execRoot}/foobarDir".
ola-rozenfeld
approved these changes
Nov 20, 2020
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.
I believe what I did in #229 was wrong when handling the symlink target.
SymlinkNode,Targetshould be relative to the directory of the symlink. Support symlinks when constructing a Merkle tree. #229 computed the path relative toexecRootinstead. This is problematic when the target is an absolute path in the filesystem.loadFiles()on the target, this timepathshould still be the part of target relative toexecRoot.