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

cakebaker · cakebaker · commit c5a23935e69b · 2024-01-05T11:17:11.000+01:00
diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs
@@ -312,6 +312,7 @@ 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()
@@ -334,6 +335,13 @@ 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();
 
     if path_ends_with_terminator(target)
diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs
@@ -403,7 +403,23 @@ 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",));
+        .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]

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>`
`312`	`312`	`)`
`313`	`313`	`.into());`
`314`	`314`	`}`
	`315`	`+`
`315`	`316`	`if source.symlink_metadata().is_err() {`
`316`	`317`	`return Err(if path_ends_with_terminator(source) {`
`317`	`318`	`MvError::CannotStatNotADirectory(source.quote().to_string()).into()`
`@@ -334,6 +335,13 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>`
`334`	`335`	`}`
`335`	`336`	`}`
`336`	`337`
	`338`	`+ if source.parent() == Some(target) {`
	`339`	`+ return Err(`
	`340`	`+ // use source twice to match GNU's error message`
	`341`	`+ MvError::SameFile(source.quote().to_string(), source.quote().to_string()).into(),`
	`342`	`+ );`
	`343`	`+ }`
	`344`	`+`
`337`	`345`	`let target_is_dir = target.is_dir();`
`338`	`346`
`339`	`347`	`if path_ends_with_terminator(target)`