Merge pull request #6905 from uutils/revert-5788-mv_same_file

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

Author: sylvestre

src/uu/mv/src/mv.rs

@@ -314,7 +314,6 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>
         )
         .into());
     }
-
     if source.symlink_metadata().is_err() {
         return Err(if path_ends_with_terminator(source) {
             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 source_is_dir = source.is_dir();
 

tests/by-util/test_mv.rs

@@ -402,23 +402,7 @@ fn test_mv_same_file() {
     ucmd.arg(file_a)
         .arg(file_a)
         .fails()
-        .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"));
+        .stderr_is(format!("mv: '{file_a}' and '{file_a}' are the same file\n",));
 }
 
 #[test]