summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:28 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:28 +0900
commit2cfab6087790ceeb81eb91eeb1300500cfa4c948 (patch)
tree12b60cadde36404d455a1adc53bc626af4704565 /t/helper
parentMerge branch 'dl/branch-from-3dot-merge-base' (diff)
parentparse-options: don't emit "ambiguous option" for aliases (diff)
downloadtgif-2cfab6087790ceeb81eb91eeb1300500cfa4c948.tar.xz
Merge branch 'nd/parse-options-aliases'
Attempt to use an abbreviated option in "git clone --recurs" is responded by a request to disambiguate between --recursive and --recurse-submodules, which is bad because these two are synonyms. The parse-options API has been extended to define such synonyms more easily and not produce an unnecessary failure. * nd/parse-options-aliases: parse-options: don't emit "ambiguous option" for aliases
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-parse-options.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 2232b2f79e..af82db06ac 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -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;