summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-03 15:42:47 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-03 15:42:47 +0900
commitb2a2c4d8099c69ec997e51cac489c0947ad17956 (patch)
tree49f19be7f56bd175e4741fd054c205d77242560c /t/helper
parentMerge branch 'js/rebase-i-final' (diff)
parentparse-options: only insert newline in help text if needed (diff)
downloadtgif-b2a2c4d8099c69ec997e51cac489c0947ad17956.tar.xz
Merge branch 'bc/rev-parse-parseopt-fix'
Recent versions of "git rev-parse --parseopt" did not parse the option specification that does not have the optional flags (*=?!) correctly, which has been corrected. * bc/rev-parse-parseopt-fix: parse-options: only insert newline in help text if needed parse-options: write blank line to correct output stream t0040,t1502: Demonstrate parse_options bugs git-rebase: don't ignore unexpected command line arguments rev-parse parseopt: interpret any whitespace as start of help text rev-parse parseopt: do not search help text for flag chars t1502: demonstrate rev-parse --parseopt option mis-parsing
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-parse-options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 75fe883aac..630c76d127 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -99,6 +99,8 @@ int cmd_main(int argc, const char **argv)
const char *prefix = "prefix/";
const char *usage[] = {
"test-parse-options <options>",
+ "",
+ "A helper function for the parse-options API.",
NULL
};
struct string_list expect = STRING_LIST_INIT_NODUP;