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

Merge pull request #5695 from cakebaker/mv_update_destination_with_trailing_slash

Browse source 
mv: allow destination with slash when using --update
This commit is contained in:
Sylvestre Ledru 2023-12-23 09:08:08 +01:00 committed by GitHub
commit 2635ddf719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,11 @@ fn handle_two_paths(source: &Path, target: &Path, opts: &Options) -> UResult<()>
let target_is_dir = target.is_dir();
if path_ends_with_terminator(target) && !target_is_dir && !opts.no_target_dir {
if path_ends_with_terminator(target)
&& !target_is_dir
&& !opts.no_target_dir
&& opts.update != UpdateMode::ReplaceIfOlder
{
return Err(MvError::FailedToAccessNotADirectory(target.quote().to_string()).into());
}

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

@ -905,6 +905,20 @@ fn test_mv_update_option() {
assert!(!at.file_exists(file_b));
}
#[test]
fn test_mv_update_with_dest_ending_with_slash() {
let (at, mut ucmd) = at_and_ucmd!();
let source = "source";
let dest = "destination/";
at.mkdir("source");
ucmd.arg("--update").arg(source).arg(dest).succeeds();
assert!(!at.dir_exists(source));
assert!(at.dir_exists(dest));
}
#[test]
fn test_mv_arg_update_none() {
let (at, mut ucmd) = at_and_ucmd!();