diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-01 20:59:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 20:59:31 -0800 |
| commit | 66b8800e53b20cda13446b462531641884089a77 (patch) | |
| tree | 53ef62b1b878ee340809499296fdad4a898f3db3 /builtin | |
| parent | 260eb7e38966bdad79aae2e125c9a07b19abd0f8 (diff) | |
| parent | cbb08c2e0b41ab162838aa1e83b959bac91151e2 (diff) | |
| download | git-66b8800e53b20cda13446b462531641884089a77.tar.gz | |
Merge branch 'rs/no-no-no-parseopt'
* rs/no-no-no-parseopt:
parse-options: remove PARSE_OPT_NEGHELP
parse-options: allow positivation of options starting, with no-
test-parse-options: convert to OPT_BOOL()
Conflicts:
builtin/grep.c
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 4 | ||||
| -rw-r--r-- | builtin/grep.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 08fed989a4..19509ea754 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -647,9 +647,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) "Output full tree for each commit"), OPT_BOOLEAN(0, "use-done-feature", &use_done_feature, "Use the done feature to terminate the stream"), - { OPTION_NEGBIT, 0, "data", &no_data, NULL, - "Skip output of blob data", - PARSE_OPT_NOARG | PARSE_OPT_NEGHELP, NULL, 1 }, + OPT_BOOL(0, "no-data", &no_data, "Skip output of blob data"), OPT_END() }; diff --git a/builtin/grep.c b/builtin/grep.c index e4ea900783..643938d905 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -684,9 +684,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOLEAN(0, "cached", &cached, "search in index instead of in the work tree"), - { OPTION_BOOLEAN, 0, "index", &use_index, NULL, - "finds in contents not managed by git", - PARSE_OPT_NOARG | PARSE_OPT_NEGHELP }, + OPT_NEGBIT(0, "no-index", &use_index, + "finds in contents not managed by git", 1), OPT_BOOLEAN(0, "untracked", &untracked, "search in both tracked and untracked files"), OPT_SET_INT(0, "exclude-standard", &opt_exclude, |