kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

check-attr: the name of the character is NUL, not NULL 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2013-07-11 22:56:24 -07:00
parent 800531a866
commit 94a55e4e9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/check-attr.c
View File

@ -13,14 +13,14 @@ N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
NULL NULL
}; };


static int null_term_line; static int nul_term_line;


static const struct option check_attr_options[] = { static const struct option check_attr_options[] = {
OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")), OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")),
OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")), OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")),
OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")), OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
OPT_BOOLEAN('z', NULL, &null_term_line, OPT_BOOLEAN('z', NULL, &nul_term_line,
N_("input paths are terminated by a null character")), N_("input paths are terminated by a NUL character")),
OPT_END() OPT_END()
}; };


@ -65,7 +65,7 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
struct git_attr_check *check) struct git_attr_check *check)
{ {
struct strbuf buf, nbuf; struct strbuf buf, nbuf;
int line_termination = null_term_line ? 0 : '\n'; int line_termination = nul_term_line ? 0 : '\n';


strbuf_init(&buf, 0); strbuf_init(&buf, 0);
strbuf_init(&nbuf, 0); strbuf_init(&nbuf, 0);