Merge branch 'ab/sha1dc'

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index cc88fba05752cbf67c2669c219cc0a65d4a354ee..af82db06ac59c77c181351c76fff81ebe92f38c6 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -132,7 +132,7 @@ int cmd__parse_options(int argc, const char **argv)
                OPT_NOOP_NOARG(0, "obsolete"),
                OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
                OPT_GROUP("Magic arguments"),
-               OPT_ARGUMENT("quux", "means --quux"),
+               OPT_ARGUMENT("quux", NULL, "means --quux"),
                OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
                        number_callback),
                { OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
@@ -149,6 +149,9 @@ int cmd__parse_options(int argc, const char **argv)
                OPT_CALLBACK(0, "expect", &expect, "string",
                             "expected output in the variable dump",
                             collect_expect),
+               OPT_GROUP("Alias"),
+               OPT_STRING('A', "alias-source", &string, "string", "get a string"),
+               OPT_ALIAS('Z', "alias-target", "alias-source"),
                OPT_END(),
        };
        int i;