Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Eliah Kagan <degeneracypressure@gmail.com>
  • Loading branch information
Byron and EliahKagan committed May 22, 2024
1 parent d2ae9d5 commit 1242151
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions gix-fs/tests/stack/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn path_join_handling() {
assert_eq!(
p("c:").join("relative"),
p("c:relative"),
"absolute + relative = strange joined result with missing backslash, but it's a valid path that works just like `c:\relative`"
"drive + relative = strange joined result with missing backslash, but it's a valid path that works just like `c:\relative`"
);
assert_eq!(
p("c:\\").join("relative"),
Expand Down Expand Up @@ -102,7 +102,7 @@ fn path_join_handling() {
assert_eq!(
p("c:\\").join("\\\\.\\"),
p("\\\\.\\"),
"d-drive-with-bs + device-namespace-unc = device-namespace-unc"
"c-drive-with-bs + device-namespace-unc = device-namespace-unc"
);
assert_eq!(
p("/").join("C:/"),
Expand Down
2 changes: 1 addition & 1 deletion gix-ref/src/store/file/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub struct Store {
pub write_reflog: WriteReflog,
/// The namespace to use for edits and reads
pub namespace: Option<Namespace>,
/// This is only useful on Windows, which may have 'virtual' devices on each level of a path so that
/// This is only needed on Windows, where some device names are reserved at any level of a path, so that
/// reading or writing `refs/heads/CON` for example would read from the console, or write to it.
pub prohibit_windows_device_names: bool,
/// If set, we will convert decomposed unicode like `a\u308` into precomposed unicode like `ä` when reading
Expand Down
10 changes: 5 additions & 5 deletions gix-validate/tests/path/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ mod component {
mktest!(dot_gitmodules_as_file, b".gitmodules", UNIX_OPTS);
mktest!(
starts_with_dot_git_with_backslashes_on_linux,
b".git\\hooks\\precommit",
b".git\\hooks\\pre-commit",
UNIX_OPTS
);
mktest!(not_dot_git_shorter, b".gi", NO_OPTS);
Expand Down Expand Up @@ -136,7 +136,7 @@ mod component {
mktest!(dot_git_upper, b".GIT", Error::DotGitDir, NO_OPTS);
mktest!(
starts_with_dot_git_with_backslashes_on_windows,
b".git\\hooks\\precommit",
b".git\\hooks\\pre-commit",
Error::PathSeparator
);
mktest!(dot_git_upper_hfs, ".GIT\u{200e}".as_bytes(), Error::DotGitDir);
Expand Down Expand Up @@ -199,12 +199,12 @@ mod component {
Error::WindowsIllegalCharacter
);
mktest!(
ntfs_stream_default_explicit,
b"file:$ANYTHING_REALLY:$DATA",
ntfs_stream_explicit,
b"file:ANYTHING_REALLY:$DATA",
Error::WindowsIllegalCharacter
);
mktest!(
dot_gitmodules_lower_ntfs_stream_default_explicit,
dot_gitmodules_lower_ntfs_stream,
b".gitmodules:$DATA:$DATA",
Error::SymlinkedGitModules,
Symlink,
Expand Down

0 comments on commit 1242151

Please sign in to comment.