Fix submodule skip directory matching#1352
Open
JamBalaya56562 wants to merge 1 commit into
Open
Conversation
|
This pull request has been imported. If you are a Meta employee, you can view this in D110681347. (Because this pull request was imported automatically, there will not be any future comments.) |
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
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.
Summary
This fixes a false-positive
sl statusdeletion report when a repository has a root submodule path whose basename also appears in a normal nested directory.The physical working copy walker receives submodule paths as directories to skip. It was comparing those skip entries against the current directory entry basename, so a root submodule such as
examplesalso causedtests/misc/ino2cpp/examplesto be skipped. Tracked files under the skipped nested directory were then reported as deleted.Changes
candidate_pathinstead of the entry basename.exampleswhile still walkingtests/misc/ino2cpp/examples.Validation
mise exec rust@nightly -- cmd /v:on /c "set CARGO_HOME=C:\c&& cargo fmt --check -p sapling-workingcopy"mise exec rust@nightly -- cmd /v:on /c "set CARGO_HOME=C:\c&& cargo test -p sapling-workingcopy --lib test_multiwalker_skip_dirs_are_repo_relative -- --exact", but the local Windows build stopped before running the test becauseopenssl-syscould not find an OpenSSL/vcpkg installation.