diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:14 (GMT) |
| commit | b72e90712eb0e802b232ad4c88460d04279c7111 (patch) | |
| tree | fa942ba292b5e3dd1091c526700a7d801ef40358 /t/helper | |
| parent | d2dba18ced8e4939a3cd135998c54874ce73adc1 (diff) | |
| parent | 20de316e33446f37200e51aa333ba7d824dfd478 (diff) | |
| download | git-b72e90712eb0e802b232ad4c88460d04279c7111.zip git-b72e90712eb0e802b232ad4c88460d04279c7111.tar.gz git-b72e90712eb0e802b232ad4c88460d04279c7111.tar.bz2 | |
Merge branch 'js/difftool-no-index'
"git difftool" can now run outside a repository.
* js/difftool-no-index:
difftool: allow running outside Git worktrees with --no-index
parse-options: make OPT_ARGUMENT() more useful
difftool: remove obsolete (and misleading) comment
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-parse-options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c index cc88fba..2232b2f 100644 --- 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", |