Merge pull request #4782 from cakebaker/mv_no_clobber_behavior_change

mv: adapt -n behavior to GNU mv 9.3
This commit is contained in:
Sylvestre Ledru
2023-04-26 22:47:12 +02:00
committed by GitHub
2 changed files with 9 additions and 3 deletions
+6 -1
View File
@@ -419,7 +419,12 @@ fn rename(
}
match b.overwrite {
OverwriteMode::NoClobber => return Ok(()),
OverwriteMode::NoClobber => {
return Err(io::Error::new(
io::ErrorKind::Other,
format!("not replacing {}", to.quote()),
));
}
OverwriteMode::Interactive => {
if !prompt_yes!("overwrite {}?", to.quote()) {
return Err(io::Error::new(io::ErrorKind::Other, ""));
+3 -2
View File
@@ -232,8 +232,9 @@ fn test_mv_no_clobber() {
ucmd.arg("-n")
.arg(file_a)
.arg(file_b)
.succeeds()
.no_stderr();
.fails()
.code_is(1)
.stderr_only(format!("mv: not replacing '{file_b}'\n"));
assert!(at.file_exists(file_a));
assert!(at.file_exists(file_b));