diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:23 -0700 |
| commit | 17d778e710f9dacc770b5790e792b85cdba75a9d (patch) | |
| tree | 1a3a97aa0c6d5cd86505e12ab2fc58e4f5bf849f /t/t0000-basic.sh | |
| parent | 5e97f464df082d8f45e163bbf24341dceeafe89d (diff) | |
| parent | 450f437fb0fe276a6e946c281c768118e39dc9e7 (diff) | |
| download | git-17d778e710f9dacc770b5790e792b85cdba75a9d.tar.gz | |
Merge branch 'dr/ceiling'
* dr/ceiling:
Eliminate an unnecessary chdir("..")
Add support for GIT_CEILING_DIRECTORIES
Fold test-absolute-path into test-path-utils
Implement normalize_absolute_path
Conflicts:
cache.h
setup.c
Diffstat (limited to 't/t0000-basic.sh')
| -rwxr-xr-x | t/t0000-basic.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 690f80ab27..d7cbc5c6da 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -301,14 +301,14 @@ test_expect_success 'absolute path works as expected' ' mkdir third && dir="$(cd .git; pwd -P)" && dir2=third/../second/other/.git && - test "$dir" = "$(test-absolute-path $dir2)" && + test "$dir" = "$(test-path-utils make_absolute_path $dir2)" && file="$dir"/index && - test "$file" = "$(test-absolute-path $dir2/index)" && + test "$file" = "$(test-path-utils make_absolute_path $dir2/index)" && basename=blub && - test "$dir/$basename" = "$(cd .git && test-absolute-path "$basename")" && + test "$dir/$basename" = "$(cd .git && test-path-utils make_absolute_path "$basename")" && ln -s ../first/file .git/syml && sym="$(cd first; pwd -P)"/file && - test "$sym" = "$(test-absolute-path "$dir2/syml")" + test "$sym" = "$(test-path-utils make_absolute_path "$dir2/syml")" ' test_expect_success 'very long name in the index handled sanely' ' |