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 /parse-options.h | |
| 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 'parse-options.h')
| -rw-r--r-- | parse-options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 0f73787..cc9230a 100644 --- a/parse-options.h +++ b/parse-options.h @@ -140,8 +140,8 @@ struct option { #define OPT_INTEGER_F(s, l, v, h, f) { OPTION_INTEGER, (s), (l), (v), N_("n"), (h), (f) } #define OPT_END() { OPTION_END } -#define OPT_ARGUMENT(l, h) { OPTION_ARGUMENT, 0, (l), NULL, NULL, \ - (h), PARSE_OPT_NOARG} +#define OPT_ARGUMENT(l, v, h) { OPTION_ARGUMENT, 0, (l), (v), NULL, \ + (h), PARSE_OPT_NOARG, NULL, 1 } #define OPT_GROUP(h) { OPTION_GROUP, 0, NULL, NULL, NULL, (h) } #define OPT_BIT(s, l, v, h, b) OPT_BIT_F(s, l, v, h, b, 0) #define OPT_BITOP(s, l, v, h, set, clear) { OPTION_BITOP, (s), (l), (v), NULL, (h), \ |