diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
commit | af543833d4e10163af8045859cc081969fa5fcec (patch) | |
tree | 8d131837c007202fa2e733996c8b5384fe73bde5 /test-parse-options.c | |
parent | fbca6911dedd58136d27bff452c3ccdf48c82779 (diff) | |
parent | af1032edf951b4f0f0b3811af4e34e26198a9ef8 (diff) | |
download | git-af543833d4e10163af8045859cc081969fa5fcec.tar.gz |
Merge branch 'jc/parse-options-boolean'
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
Diffstat (limited to 'test-parse-options.c')
-rw-r--r-- | test-parse-options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test-parse-options.c b/test-parse-options.c index 91a5701657..36487c402b 100644 --- a/test-parse-options.c +++ b/test-parse-options.c @@ -54,6 +54,7 @@ int main(int argc, const char **argv) OPT_STRING(0, "string2", &string, "str", "get another string"), OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"), OPT_STRING('o', NULL, &string, "str", "get another string"), + OPT_NOOP_NOARG(0, "obsolete"), OPT_SET_PTR(0, "default-string", &string, "set string to default", (unsigned long)"default"), OPT_STRING_LIST(0, "list", &list, "str", "add str to list"), |