From f7cd8c50b9ab83e084e8f52653ecc8d90665eef2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 11 Jul 2013 23:02:40 -0700 Subject: check-attr -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. Signed-off-by: Junio C Hamano --- builtin/check-attr.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'builtin/check-attr.c') diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 7cc9b5d94a9..cd46690ec71 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -20,7 +20,7 @@ static const struct option check_attr_options[] = { 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, &nul_term_line, - N_("input paths are terminated by a NUL character")), + N_("terminate input and output records by a NUL character")), OPT_END() }; @@ -38,8 +38,16 @@ static void output_attr(int cnt, struct git_attr_check *check, else if (ATTR_UNSET(value)) value = "unspecified"; - quote_c_style(file, NULL, stdout, 0); - printf(": %s: %s\n", git_attr_name(check[j].attr), value); + if (nul_term_line) { + printf("%s%c" /* path */ + "%s%c" /* attrname */ + "%s%c" /* attrvalue */, + file, 0, git_attr_name(check[j].attr), 0, value, 0); + } else { + quote_c_style(file, NULL, stdout, 0); + printf(": %s: %s\n", git_attr_name(check[j].attr), value); + } + } } -- cgit v1.2.3