mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-25 00:36:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

working_copy: don't follow symlinks when visiting files in gitignored directory

Browse source 
Fixes #2878
This commit is contained in:
Yuya Nishihara 2024-01-24 12:29:33 +09:00
parent d0d4496258
commit 5a7d8ac596
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -37,6 +37,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed bugs ### Fixed bugs
* Fixed snapshots of symlinks in `gitignore`-d directory.
[#2878](https://github.com/martinvonz/jj/issues/2878)
## [0.13.0] - 2024-01-03 ## [0.13.0] - 2024-01-03

2
lib/src/local_working_copy.rs
View file

@ -894,7 +894,7 @@ impl TreeState {
continue; continue;
} }
let disk_path = tracked_path.to_fs_path(&self.working_copy_path); let disk_path = tracked_path.to_fs_path(&self.working_copy_path);
let metadata = match disk_path.metadata() { let metadata = match disk_path.symlink_metadata() {
Ok(metadata) => metadata, Ok(metadata) => metadata,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => { Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
continue; continue;

2
lib/tests/test_local_working_copy.rs
View file

@ -836,9 +836,7 @@ fn test_gitignores_ignored_directory_already_tracked() {
(modified_normal_path, Kind::Normal, "modified"), (modified_normal_path, Kind::Normal, "modified"),
(unchanged_executable_path, Kind::Executable, "contents"), (unchanged_executable_path, Kind::Executable, "contents"),
(modified_executable_path, Kind::Executable, "modified"), (modified_executable_path, Kind::Executable, "modified"),
#[cfg(not(unix))] // TODO
(unchanged_symlink_path, Kind::Symlink, "contents"), (unchanged_symlink_path, Kind::Symlink, "contents"),
#[cfg(not(unix))] // TODO
(modified_symlink_path, Kind::Symlink, "modified"), (modified_symlink_path, Kind::Symlink, "modified"),
]); ]);
assert_eq!( assert_eq!(