Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-12 14:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mv: show "same file" error for mv d/f d"

Browse source
This commit is contained in:
Sylvestre Ledru 2024-12-02 20:39:39 +01:00 committed by GitHub
parent 527bb6fad8
commit 9877085702
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/uu/mv/src/mv.rs
View file

@ -314,7 +314,6 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>
) )
.into()); .into());
} }
if source.symlink_metadata().is_err() { if source.symlink_metadata().is_err() {
return Err(if path_ends_with_terminator(source) { return Err(if path_ends_with_terminator(source) {
MvError::CannotStatNotADirectory(source.quote().to_string()).into() MvError::CannotStatNotADirectory(source.quote().to_string()).into()
@ -337,13 +336,6 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>
} }
} }
if source.parent() == Some(target) {
return Err(
// use source twice to match GNU's error message
MvError::SameFile(source.quote().to_string(), source.quote().to_string()).into(),
);
}
let target_is_dir = target.is_dir(); let target_is_dir = target.is_dir();
let source_is_dir = source.is_dir(); let source_is_dir = source.is_dir();

18
tests/by-util/test_mv.rs
View file

@ -402,23 +402,7 @@ fn test_mv_same_file() {
ucmd.arg(file_a) ucmd.arg(file_a)
.arg(file_a) .arg(file_a)
.fails() .fails()
.stderr_is(format!("mv: '{file_a}' and '{file_a}' are the same file\n")); .stderr_is(format!("mv: '{file_a}' and '{file_a}' are the same file\n",));
}
#[test]
fn test_mv_file_to_same_dir() {
let (at, mut ucmd) = at_and_ucmd!();
let file = "a";
let dir = "dir";
let path = &format!("{dir}/{file}");
at.mkdir(dir);
at.touch(path);
ucmd.arg(path)
.arg(dir)
.fails()
.stderr_is(format!("mv: '{path}' and '{path}' are the same file\n"));
} }
#[test] #[test]