RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

Merge pull request #4132 from tertsdiepraam/sort-accept-sort-mode-multiple-times

Browse source 
`sort`: allow a sort mode to appear multiple times
This commit is contained in:
Sylvestre Ledru 2022-11-17 21:43:28 +01:00 • committed by GitHub
commit 435ef5da8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/sort/src/sort.rs
View file

@ -455,7 +455,7 @@ impl KeySettings {
}
fn set_sort_mode(&mut self, mode: SortMode) -> Result<(), String> {
if self.mode != SortMode::Default {
if self.mode != SortMode::Default && self.mode != mode {
return Err(format!(
"options '-{}{}' are incompatible",
self.mode.get_short_name().unwrap(),

5
tests/by-util/test_sort.rs
View file

@ -1156,3 +1156,8 @@ fn test_tmp_files_deleted_on_sigint() {
// `sort` should have deleted the temporary directory again.
assert!(read_dir(at.plus("tmp_dir")).unwrap().next().is_none());
}
#[test]
fn test_same_sort_mode_twice() {
new_ucmd!().args(&["-k", "2n,2n", "empty.txt"]).succeeds();
}