Skip to content

join: implement last-flag-wins for --check-order/--nocheck-order #16074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
naufalfx805-source wants to merge 2 commits into from
Closed

join: implement last-flag-wins for --check-order/--nocheck-order #16074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a2f002
join: implement last-flag-wins for --check-order/--nocheck-order
Nopp805 Oct 31, 2026
fcdb428
refactor: use clap overrides_with for check-order last-wins
Nopp805 Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/uu/join/src/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,12 +849,10 @@ fn parse_settings(matches: &clap::ArgMatches, diag_args: Option<&[OsString]>) ->
settings.empty = empty.as_bytes().to_vec();
}

if matches.get_flag("nocheck-order") {
settings.check_order = CheckOrder::Disabled;
}

if matches.get_flag("check-order") {
settings.check_order = CheckOrder::Enabled;
} else if matches.get_flag("nocheck-order") {
settings.check_order = CheckOrder::Disabled;
}

if matches.get_flag("header") {
Expand Down Expand Up @@ -1016,12 +1014,14 @@ pub fn uu_app() -> Command {
Arg::new("check-order")
.long("check-order")
.help(translate!("join-help-check-order"))
.overrides_with("nocheck-order")
.action(ArgAction::SetTrue),
)
.arg(
Arg::new("nocheck-order")
.long("nocheck-order")
.help(translate!("join-help-nocheck-order"))
.overrides_with("check-order")
.action(ArgAction::SetTrue),
)
.arg(
Expand Down
29 changes: 29 additions & 0 deletions tests/by-util/test_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,3 +1038,32 @@ fn test_missing_key_is_empty_key() {
.succeeds()
.stdout_only("1002 bob\n");
}

#[test]
fn check_order_nocheck_order_last_wins() {
// --nocheck-order after --check-order: nocheck wins, unsorted input succeeds.
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;
at.write("unsorted.txt", "b\na\n");
ts.ucmd()
.args(&[
"--check-order",
"--nocheck-order",
"unsorted.txt",
"unsorted.txt",
])
.succeeds()
.stdout_contains("a")
.stdout_contains("b");

// --check-order after --nocheck-order: check wins, unsorted input fails.
ts.ucmd()
.args(&[
"--nocheck-order",
"--check-order",
"unsorted.txt",
"unsorted.txt",
])
.fails()
.stderr_contains("is not sorted");
}
Loading