Merge pull request #7051 from cakebaker/chroot_remove_g_short_option

chroot: remove `-G` short option
uutils · Jan 3, 2025 · 88cdf16 · 88cdf16
2 parents 2cdf309 + e22bcbb
commit 88cdf16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs
@@ -192,19 +192,14 @@ pub fn uu_app() -> Command {
         )
         .arg(
             Arg::new(options::GROUPS)
-                .short('G')
                 .long(options::GROUPS)
                 .help("Comma-separated list of groups to switch to")
                 .value_name("GROUP1,GROUP2..."),
         )
         .arg(
             Arg::new(options::USERSPEC)
                 .long(options::USERSPEC)
-                .help(
-                    "Colon-separated user and group to switch to. \
-                     Same as -u USER -g GROUP. \
-                     Userspec has higher preference than -u and/or -g",
-                )
+                .help("Colon-separated user and group to switch to.")
                 .value_name("USER:GROUP"),
         )
         .arg(

diff --git a/tests/by-util/test_chroot.rs b/tests/by-util/test_chroot.rs
@@ -141,7 +141,7 @@ fn test_preference_of_userspec() {
         .arg("a")
         .arg("--user")
         .arg("fake")
-        .arg("-G")
+        .arg("--groups")
         .arg("ABC,DEF")
         .arg(format!("--userspec={username}:{group_name}"))
         .fails();