This repository was archived by the owner on Sep 11, 2020. It is now read-only.
utils: merkletrie, filesystem fix symlinks to dir #640
Merged
mcuadros merged 2 commits intosrc-d:masterfrom Nov 20, 2017
Merged
utils: merkletrie, filesystem fix symlinks to dir #640mcuadros merged 2 commits intosrc-d:masterfrom
mcuadros merged 2 commits intosrc-d:masterfrom
Conversation
Contributor
|
Make sense, but we need a test for merge this. |
Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 tried to figure how to write a proper test, but failed in a reasonable time frame, so sending the PR without a test. Nevertheless, here is a tiny repository which reproduces an issue: https://github.com/dimonomid/git-go-symlink-test/blob/master/test_symlink_dir.go
It uses another repository as a test case: https://github.com/dimonomid/git-go-fixture-dir-symlink , which has just two commits; the second one adds this tree:
And to reproduce the issue, we can just clone the repo (so that we have these
dir2/file2and symlink to it), and then checkout the previous revision. This is the list of changes it tries to apply:And obviously the last one fails, because
dir2/file2was already removed before. This PR prevents non-dir items from having children.