Merge pull request uutils#7191 from ic3man5/issue_7184

sort: options -C and -c should be mutually exclusive but aren't
cakebaker · Jan 23, 2025 · 6c8ec89 · 6c8ec89
2 parents 5b05670 + f394a20
commit 6c8ec89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs
@@ -1371,14 +1371,14 @@ pub fn uu_app() -> Command {
                     options::check::QUIET,
                     options::check::DIAGNOSE_FIRST,
                 ]))
-                .conflicts_with(options::OUTPUT)
+                .conflicts_with_all([options::OUTPUT, options::check::CHECK_SILENT])
                 .help("check for sorted input; do not sort"),
         )
         .arg(
             Arg::new(options::check::CHECK_SILENT)
                 .short('C')
                 .long(options::check::CHECK_SILENT)
-                .conflicts_with(options::OUTPUT)
+                .conflicts_with_all([options::OUTPUT, options::check::CHECK])
                 .help(
                     "exit successfully if the given file is already sorted, \
                 and exit with status 1 otherwise.",

diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs
@@ -1324,3 +1324,8 @@ fn test_human_blocks_r_and_q() {
         .succeeds()
         .stdout_is(output);
 }
+
+#[test]
+fn test_args_check_conflict() {
+    new_ucmd!().arg("-c").arg("-C").fails();
+}