From f5114a40c0d0276ce6ff215a3dc51eb19da5b420 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 4 Aug 2011 06:47:46 +0200 Subject: [PATCH] git-check-attr: Normalize paths Normalize the path arguments (relative to the working tree root, if applicable) before looking up their attributes. This requires passing the prefix down the call chain. This fixes two test cases for different reasons: * "unnormalized paths" is fixed because the .gitattribute-file-seeking code is not confused into reading the top-level file twice. * "relative paths" is fixed because the canonical pathnames are passed to get_check_attr() or get_all_attrs(), allowing them to match the pathname patterns as expected. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- builtin/check-attr.c | 20 ++++++++++++-------- t/t0003-attributes.sh | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 6b163687b..708988a0e 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -41,22 +41,26 @@ static void output_attr(int cnt, struct git_attr_check *check, } } -static void check_attr(int cnt, struct git_attr_check *check, - const char *file) +static void check_attr(const char *prefix, int cnt, + struct git_attr_check *check, const char *file) { + char *full_path = + prefix_path(prefix, prefix ? strlen(prefix) : 0, file); if (check != NULL) { - if (git_check_attr(file, cnt, check)) + if (git_check_attr(full_path, cnt, check)) die("git_check_attr died"); output_attr(cnt, check, file); } else { - if (git_all_attrs(file, &cnt, &check)) + if (git_all_attrs(full_path, &cnt, &check)) die("git_all_attrs died"); output_attr(cnt, check, file); free(check); } + free(full_path); } -static void check_attr_stdin_paths(int cnt, struct git_attr_check *check) +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'; @@ -70,7 +74,7 @@ static void check_attr_stdin_paths(int cnt, struct git_attr_check *check) die("line is badly quoted"); strbuf_swap(&buf, &nbuf); } - check_attr(cnt, check, buf.buf); + check_attr(prefix, cnt, check, buf.buf); maybe_flush_or_die(stdout, "attribute to stdout"); } strbuf_release(&buf); @@ -154,10 +158,10 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix) } if (stdin_paths) - check_attr_stdin_paths(cnt, check); + check_attr_stdin_paths(prefix, cnt, check); else { for (i = filei; i < argc; i++) - check_attr(cnt, check, argv[i]); + check_attr(prefix, cnt, check, argv[i]); maybe_flush_or_die(stdout, "attribute to stdout"); } return 0; diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index f6cf77d12..ae2f1da28 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -93,7 +93,7 @@ test_expect_success 'attribute test' ' ' -test_expect_failure 'unnormalized paths' ' +test_expect_success 'unnormalized paths' ' attr_check ./f f && attr_check ./a/g a/g && @@ -102,7 +102,7 @@ test_expect_failure 'unnormalized paths' ' ' -test_expect_failure 'relative paths' ' +test_expect_success 'relative paths' ' (cd a && attr_check ../f f) && (cd a && attr_check f f) && -- 2.26.2