Fix directory comparison in changes#140
Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom Apr 26, 2019
Merged
Conversation
Currently string comparison is used to detect changes. The comparisons are already done ordered, however since `-` will compare before `/`, a directory deletion which also has a directory ending with `-` can cause the wrong change output. The comparisons must be done considering directory separators as the lowest sorting value. Signed-off-by: Derek McGowan <derek@mcgstyle.net>
tonistiigi
approved these changes
Apr 26, 2019
This was referenced Apr 26, 2019
AkihiroSuda
approved these changes
Apr 26, 2019
fuweid
reviewed
Apr 26, 2019
| {"/dir1/dir2你/", "/dir1/dir2/", 1}, | ||
| {"/dir1/dir2你/", "/dir1/dir2你/", 0}, | ||
| {"/dir1/dir2你/", "/dir1/dir2你好/", -1}, | ||
| {"/dir1/dir2你/", "/dir1/dir2你-好/", -1}, |
Member
|
1 maintainer LGTM and 1 reviewer LGTM. Merging. |
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Apr 27, 2019
- containerd/continuity#140 Fix directory comparison in changes Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
May 11, 2019
- containerd/continuity#140 Fix directory comparison in changes Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 447cbff50a91fc66cd1893ebf3fdd8176a4d87bf Component: engine
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
May 14, 2019
- containerd/continuity#140 Fix directory comparison in changes Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 447cbff) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
May 14, 2019
- containerd/continuity#140 Fix directory comparison in changes Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 447cbff50a91fc66cd1893ebf3fdd8176a4d87bf) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 790388a8c5e5f2ae3afbff29d06b7509882505be Component: engine
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Currently string comparison is used to detect changes. The comparisons are already done ordered, however since
-will compare before/, a directory deletion which also has a directory ending with-can cause the wrong change output. The comparisons must be done considering directory separators as the lowest sorting value.Related to moby/buildkit#960