Skip to content

Commit

Permalink
check-attr: the name of the character is NUL, not NULL
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jul 12, 2013
1 parent 800531a commit 94a55e4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions builtin/check-attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
NULL
};

static int null_term_line;
static int nul_term_line;

static const struct option check_attr_options[] = {
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 , "stdin", &stdin_paths, N_("read file names from stdin")),
OPT_BOOLEAN('z', NULL, &null_term_line,
N_("input paths are terminated by a null character")),
OPT_BOOLEAN('z', NULL, &nul_term_line,
N_("input paths are terminated by a NUL character")),
OPT_END()
};

Expand Down Expand Up @@ -65,7 +65,7 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
struct git_attr_check *check)
{
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(&nbuf, 0);
Expand Down

0 comments on commit 94a55e4

Please sign in to comment.