check-attr: the name of the character is NUL, not NULL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 11, 2013 at 22:56 UTC
94a55e4e9f15dbcd827ae0e6feeb951c66416366
1 file changed
+4
-4
builtin/check-attr.c
+4
-4
@@ -13,14 +13,14 @@ N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
13
NULL
14
};
15
16
-static int null_term_line;
16
+static int nul_term_line;
17
18
static const struct option check_attr_options[] = {
19
OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")),
20
OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")),
21
OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
22
- OPT_BOOLEAN('z', NULL, &null_term_line,
23
- N_("input paths are terminated by a null character")),
22
+ OPT_BOOLEAN('z', NULL, &nul_term_line,
23
+ N_("input paths are terminated by a NUL character")),
24
OPT_END()
25
};
26
@@ -65,7 +65,7 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
65
struct git_attr_check *check)
66
{
67
struct strbuf buf, nbuf;
68
- int line_termination = null_term_line ? 0 : '\n';
68
+ int line_termination = nul_term_line ? 0 : '\n';
69
70
strbuf_init(&buf, 0);
71
strbuf_init(&nbuf, 0);