diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-07 12:49:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-07 12:49:57 -0800 |
| commit | 5d4ef1721ad873b8d0db1c4fc55ad9316accf2cb (patch) | |
| tree | 1d07a859334c202d771e25829631385a2d79b542 /t/t1504-ceiling-dirs.sh | |
| parent | gitweb/README: remove reference to git.kernel.org (diff) | |
| parent | Provide a mechanism to turn off symlink resolution in ceiling paths (diff) | |
| download | tgif-5d4ef1721ad873b8d0db1c4fc55ad9316accf2cb.tar.xz | |
Merge branch 'mh/maint-ceil-absolute' into maint
* mh/maint-ceil-absolute:
Provide a mechanism to turn off symlink resolution in ceiling paths
Diffstat (limited to 't/t1504-ceiling-dirs.sh')
| -rwxr-xr-x | t/t1504-ceiling-dirs.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh index cce87a5ab5..3d51615e42 100755 --- a/t/t1504-ceiling-dirs.sh +++ b/t/t1504-ceiling-dirs.sh @@ -44,6 +44,10 @@ test_prefix ceil_at_sub "" GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" test_prefix ceil_at_sub_slash "" +if test_have_prereq SYMLINKS +then + ln -s sub top +fi mkdir -p sub/dir || exit 1 cd sub/dir || exit 1 @@ -68,6 +72,19 @@ test_fail subdir_ceil_at_sub GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" test_fail subdir_ceil_at_sub_slash +if test_have_prereq SYMLINKS +then + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top" + test_fail subdir_ceil_at_top + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top/" + test_fail subdir_ceil_at_top_slash + + GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top" + test_prefix subdir_ceil_at_top_no_resolve "sub/dir/" + GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top/" + test_prefix subdir_ceil_at_top_slash_no_resolve "sub/dir/" +fi + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/dir" test_prefix subdir_ceil_at_subdir "sub/dir/" |