diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-08-04 06:47:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-04 15:57:18 -0700 |
| commit | f5114a40c0d0276ce6ff215a3dc51eb19da5b420 (patch) | |
| tree | 7ef4ab2fd35855a58a76f296aa96e3001057321a /t/t0003-attributes.sh | |
| parent | 0216af8356ef562147251c40fef72be25b8b9b07 (diff) | |
| download | git-f5114a40c0d0276ce6ff215a3dc51eb19da5b420.tar.gz | |
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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0003-attributes.sh')
| -rwxr-xr-x | t/t0003-attributes.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index f6cf77d125..ae2f1da28f 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) && |