Merge pull request #5684 from allaboutevemirolive/v10_expand

expand: fix duplicate flags
uutils · Dec 21, 2023 · e071fd3 · e071fd3
2 parents 95852db + f874788
commit e071fd3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs
@@ -275,6 +275,7 @@ pub fn uu_app() -> Command {
         .after_help(LONG_HELP)
         .override_usage(format_usage(USAGE))
         .infer_long_args(true)
+        .args_override_self(true)
         .arg(
             Arg::new(options::INITIAL)
                 .long(options::INITIAL)

diff --git a/tests/by-util/test_expand.rs b/tests/by-util/test_expand.rs
@@ -392,3 +392,20 @@ fn test_comma_with_plus_4() {
         //          01234567890
         .stdout_is("a  b    c");
 }
+
+#[test]
+fn test_args_override() {
+    new_ucmd!()
+        .args(&["-i", "-i", "with-trailing-tab.txt"])
+        .run()
+        .stdout_is(
+            "// !note: file contains significant whitespace
+// * indentation uses <TAB> characters
+int main() {
+        // * next line has both a leading & trailing tab
+        // with tabs=>	
+        return 0;
+}
+",
+        );
+}