Skip to content

Conversation

@Ada-Armstrong
Copy link
Contributor

Fix for #8893.

Additionally, files which are removed are displayed when --verbose is enabled, to mimic GNU cp behaviour.

@github-actions
Copy link

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

@Ada-Armstrong
Copy link
Contributor Author

Apologies about spamming CI. I'll get the pre-commit hook working for next time.

@github-actions
Copy link

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

@Alonely0
Copy link
Contributor

Alonely0 commented Oct 13, 2025

Ty for taking care of it for me, I'm quite busy lol. Would you mind squashing your last three commits into a single one, and renaming the second one with a cp: prefix? If we ever have to revert/bisect something, it makes our life much easier. Bear in mind that you'll have to force-push afterwards in order to overwrite the old commits on your origin branch with the new commits.

@Ada-Armstrong Ada-Armstrong force-pushed the cp_recursive_verbose_symlink branch from 5332c28 to 251d3fb Compare October 13, 2025 16:59
@Ada-Armstrong
Copy link
Contributor Author

No problem. I merged all of the commits into one to reduce the commit pollution.

@github-actions
Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

@Alonely0
Copy link
Contributor

Alonely0 commented Oct 13, 2025

That spurious Android test failure is driving me up the walls. It's not your fault lol, it's been happening on and off recently. If it was working then, it should be working now in spite of this cursed CI check. Now that I'm complaining, how are GitHub's load-bearing CI Mac Minis so slow lol.

Comment on lines 2075 to 2081
fn print_removed_path(path: &Path) {
println!(
"{}",
translate!("cp-verbose-removed", "path" => path.quote())
);
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure of the added value to wrap a single print in a function. I think you can inline it

@github-actions
Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

@RenjiSann
Copy link
Collaborator

LGTM. If you can squash the second commit into the first, that would be great. I'd rather rebase than merge, and in order to keep master "clean", it's better to get rid of "fix commits".

cp: display removed files with --verbose
@Ada-Armstrong Ada-Armstrong force-pushed the cp_recursive_verbose_symlink branch from 39796b4 to 58e602c Compare October 15, 2025 16:26
@github-actions
Copy link

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

@RenjiSann RenjiSann merged commit 37d00ae into uutils:main Oct 15, 2025
122 checks passed
@Ada-Armstrong Ada-Armstrong deleted the cp_recursive_verbose_symlink branch October 20, 2025 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants