[PATCH 8/8] t1504: stop resolving symlinks in GIT_CEILING_DIRECTORIES
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Sep 26, 2012, 19:34 UTC
- Message-ID
- <1348688090-13648-9-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1348688090-13648-1-git-send-email-mhagger@alum.mit.edu>
This test used to explicitly resolve symlinks in the paths derived from TRASH_DIRECTORY that were written to GIT_CEILING_DIRECTORIES, because the code handling GIT_CEILING_DIRECTORIES was confused by symlinks. This is no longer necessary.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- t/t1504-ceiling-dirs.sh | 67 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh index cce87a5..a4a5202 100755 --- a/t/t1504-ceiling-dirs.sh +++ b/t/t1504-ceiling-dirs.sh @@ -14,8 +14,7 @@ test_fail() { ' } -TRASH_ROOT="$PWD" -ROOT_PARENT=$(dirname "$TRASH_ROOT") +ROOT_PARENT=$(dirname "$TRASH_DIRECTORY") unset GIT_CEILING_DIRECTORIES @@ -32,16 +31,16 @@ test_prefix ceil_at_parent "" GIT_CEILING_DIRECTORIES="$ROOT_PARENT/" test_prefix ceil_at_parent_slash "" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY" test_prefix ceil_at_trash "" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/" test_prefix ceil_at_trash_slash "" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub" test_prefix ceil_at_sub "" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/" test_prefix ceil_at_sub_slash "" @@ -56,55 +55,55 @@ export GIT_CEILING_DIRECTORIES GIT_CEILING_DIRECTORIES="" test_prefix subdir_ceil_empty "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY" test_fail subdir_ceil_at_trash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/" test_fail subdir_ceil_at_trash_slash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub" test_fail subdir_ceil_at_sub -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/" test_fail subdir_ceil_at_sub_slash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/dir" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/dir" test_prefix subdir_ceil_at_subdir "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/dir/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/dir/" test_prefix subdir_ceil_at_subdir_slash "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/su" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/su" test_prefix subdir_ceil_at_su "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/su/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/su/" test_prefix subdir_ceil_at_su_slash "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/di" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/di" test_prefix subdir_ceil_at_sub_di "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/di" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub/di" test_prefix subdir_ceil_at_sub_di_slash "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/subdi" test_prefix subdir_ceil_at_subdi "sub/dir/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/subdi" test_prefix subdir_ceil_at_subdi_slash "sub/dir/" -GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub" +GIT_CEILING_DIRECTORIES="/foo:$TRASH_DIRECTORY/sub" test_fail second_of_two -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:/bar" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub:/bar" test_fail first_of_two -GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub:/bar" +GIT_CEILING_DIRECTORIES="/foo:$TRASH_DIRECTORY/sub:/bar" test_fail second_of_three -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sub" GIT_DIR=../../.git export GIT_DIR test_prefix git_dir_specified "" @@ -123,41 +122,41 @@ export GIT_CEILING_DIRECTORIES GIT_CEILING_DIRECTORIES="" test_prefix sd_ceil_empty "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY" test_fail sd_ceil_at_trash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/" test_fail sd_ceil_at_trash_slash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s" test_fail sd_ceil_at_s -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s/" test_fail sd_ceil_at_s_slash -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s/d" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s/d" test_prefix sd_ceil_at_sd "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s/d/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s/d/" test_prefix sd_ceil_at_sd_slash "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/su" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/su" test_prefix sd_ceil_at_su "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/su/" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/su/" test_prefix sd_ceil_at_su_slash "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s/di" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s/di" test_prefix sd_ceil_at_s_di "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/s/di" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/s/di" test_prefix sd_ceil_at_s_di_slash "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sdi" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sdi" test_prefix sd_ceil_at_sdi "s/d/" -GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sdi" +GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/sdi" test_prefix sd_ceil_at_sdi_slash "s/d/"
-- 1.7.11.3