summaryrefslogtreecommitdiff
path: root/builtin/check-ignore.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-04 19:39:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-04 19:39:03 (GMT)
commita86a8b9752d5abb7d0e6cd69017170e826d41fb5 (patch)
tree82c43449ca57a50066eb342ab1610c0539eb58aa /builtin/check-ignore.c
parent366b80bf0a84b607115bd4ffcd8e5ebfc7338442 (diff)
parent84d83f642a680f72f8e81313d605e61bf9efa38f (diff)
downloadgit-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.zip
git-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.tar.gz
git-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.tar.bz2
Merge branch 'sb/parseopt-boolean-removal'
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary. * sb/parseopt-boolean-removal: revert: use the OPT_CMDMODE for parsing, reducing code checkout-index: fix negations of even numbers of -n config parsing options: allow one flag multiple times hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP branch, commit, name-rev: ease up boolean conditions checkout: remove superfluous local variable log, format-patch: parsing uses OPT__QUIET Replace deprecated OPT_BOOLEAN by OPT_BOOL Remove deprecated OPTION_BOOLEAN for parsing arguments
Diffstat (limited to 'builtin/check-ignore.c')
-rw-r--r--builtin/check-ignore.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 503a559..25aa2a5 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -18,12 +18,12 @@ static const struct option check_ignore_options[] = {
OPT__QUIET(&quiet, N_("suppress progress reporting")),
OPT__VERBOSE(&verbose, N_("be verbose")),
OPT_GROUP(""),
- OPT_BOOLEAN(0, "stdin", &stdin_paths,
- N_("read file names from stdin")),
- OPT_BOOLEAN('z', NULL, &nul_term_line,
- N_("terminate input and output records by a NUL character")),
- OPT_BOOLEAN('n', "non-matching", &show_non_matching,
- N_("show non-matching input paths")),
+ OPT_BOOL(0, "stdin", &stdin_paths,
+ N_("read file names from stdin")),
+ OPT_BOOL('z', NULL, &nul_term_line,
+ N_("terminate input and output records by a NUL character")),
+ OPT_BOOL('n', "non-matching", &show_non_matching,
+ N_("show non-matching input paths")),
OPT_END()
};