Skip to content

Commit 88cdf16

Browse files
authored
Merge pull request #7051 from cakebaker/chroot_remove_g_short_option
chroot: remove `-G` short option
2 parents 2cdf309 + e22bcbb commit 88cdf16

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/uu/chroot/src/chroot.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,14 @@ pub fn uu_app() -> Command {
192192
)
193193
.arg(
194194
Arg::new(options::GROUPS)
195-
.short('G')
196195
.long(options::GROUPS)
197196
.help("Comma-separated list of groups to switch to")
198197
.value_name("GROUP1,GROUP2..."),
199198
)
200199
.arg(
201200
Arg::new(options::USERSPEC)
202201
.long(options::USERSPEC)
203-
.help(
204-
"Colon-separated user and group to switch to. \
205-
Same as -u USER -g GROUP. \
206-
Userspec has higher preference than -u and/or -g",
207-
)
202+
.help("Colon-separated user and group to switch to.")
208203
.value_name("USER:GROUP"),
209204
)
210205
.arg(

tests/by-util/test_chroot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn test_preference_of_userspec() {
141141
.arg("a")
142142
.arg("--user")
143143
.arg("fake")
144-
.arg("-G")
144+
.arg("--groups")
145145
.arg("ABC,DEF")
146146
.arg(format!("--userspec={username}:{group_name}"))
147147
.fails();

0 commit comments

Comments
 (0)