From bd91ebca759d2d6cfc2f7aa660366f5f7f09994a Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Tue, 12 Oct 2021 16:16:05 -0400
Subject: [PATCH] Remove command overrides for output options.

The overrides are not needed since both commands require the same default and allow list.
---
 src/build/config/config.yaml | 16 ++++++----------
 src/config/parse.auto.c      | 28 +++++-----------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/src/build/config/config.yaml b/src/build/config/config.yaml
index fc3375ae4..e5391d548 100644
--- a/src/build/config/config.yaml
+++ b/src/build/config/config.yaml
@@ -293,17 +293,13 @@ option:
 
   output:
     type: string
+    default: text
     command:
-      info:
-        default: text
-        allow-list:
-          - text
-          - json
-      repo-ls:
-        default: text
-        allow-list:
-          - text
-          - json
+      info: {}
+      repo-ls: {}
+    allow-list:
+      - text
+      - json
     command-role:
       main: {}
 
diff --git a/src/config/parse.auto.c b/src/config/parse.auto.c
index 30a509a23..00f7e2612 100644
--- a/src/config/parse.auto.c
+++ b/src/config/parse.auto.c
@@ -2289,31 +2289,13 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
 
         PARSE_RULE_OPTION_OPTIONAL_LIST
         (
-            PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
+            PARSE_RULE_OPTION_OPTIONAL_ALLOW_LIST
             (
-                PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdInfo),
+                "text",
+                "json"
+            ),
 
-                PARSE_RULE_OPTION_OPTIONAL_ALLOW_LIST
-                (
-                    "text",
-                    "json"
-                ),
-
-                PARSE_RULE_OPTION_OPTIONAL_DEFAULT("text"),
-            )
-
-            PARSE_RULE_OPTION_OPTIONAL_COMMAND_OVERRIDE
-            (
-                PARSE_RULE_OPTION_OPTIONAL_COMMAND(cfgCmdRepoLs),
-
-                PARSE_RULE_OPTION_OPTIONAL_ALLOW_LIST
-                (
-                    "text",
-                    "json"
-                ),
-
-                PARSE_RULE_OPTION_OPTIONAL_DEFAULT("text"),
-            )
+            PARSE_RULE_OPTION_OPTIONAL_DEFAULT("text"),
         ),
     ),