summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 06:07:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-12 06:07:55 (GMT)
commitd6dcb92a1d462ef3f5739f4fd9b2000ba998f944 (patch)
tree8f34f6a96c0aeea3cf8db8b0cc4c6fdaa84fb30c /builtin
parent94a55e4e9f15dbcd827ae0e6feeb951c66416366 (diff)
downloadgit-d6dcb92a1d462ef3f5739f4fd9b2000ba998f944.zip
git-d6dcb92a1d462ef3f5739f4fd9b2000ba998f944.tar.gz
git-d6dcb92a1d462ef3f5739f4fd9b2000ba998f944.tar.bz2
check-ignore -z: a single -z should apply to both input and output
Unless a command has separate --nul-terminated-{input,output} options, the --nul-terminated-records (-z) option should apply to both input and output for consistency. The caller knows that its input paths may need to be protected for LF, and the program shows these problematic paths to its output. The code already did the right thing. Only the help text needs fixing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/check-ignore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index be22bce..03e509e 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -21,7 +21,7 @@ static const struct option check_ignore_options[] = {
OPT_BOOLEAN(0, "stdin", &stdin_paths,
N_("read file names from stdin")),
OPT_BOOLEAN('z', NULL, &nul_term_line,
- N_("input paths are terminated by a NUL character")),
+ N_("terminate input and output records by a NUL character")),
OPT_END()
};