prefer test -h over test -L in shell scripts

Even though "-L" is POSIX, the former is more portable, and
we tend to prefer it already.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2010-09-21 20:35:59 -04:00 committed by Junio C Hamano
parent 055467dd4a
commit afa0876050
3 changed files with 5 additions and 5 deletions

View File

@ -42,7 +42,7 @@ then
fi fi
# don't link to a workdir # don't link to a workdir
if test -L "$git_dir/config" if test -h "$git_dir/config"
then then
die "\"$orig_git\" is a working directory only, please specify" \ die "\"$orig_git\" is a working directory only, please specify" \
"a complete repository." "a complete repository."

View File

@ -143,7 +143,7 @@ test_expect_success "$name" '
git svn set-tree --find-copies-harder --rmdir \ git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch5 && ${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" && svn_cmd up "$SVN_TREE" &&
test -L "$SVN_TREE"/exec.sh' test -h "$SVN_TREE"/exec.sh'
name='new symlink is added to a file that was also just made executable' name='new symlink is added to a file that was also just made executable'
@ -156,7 +156,7 @@ test_expect_success "$name" '
${remotes_git_svn}..mybranch5 && ${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" && svn_cmd up "$SVN_TREE" &&
test -x "$SVN_TREE"/bar/zzz && test -x "$SVN_TREE"/bar/zzz &&
test -L "$SVN_TREE"/exec-2.sh' test -h "$SVN_TREE"/exec-2.sh'
name='modify a symlink to become a file' name='modify a symlink to become a file'
test_expect_success "$name" ' test_expect_success "$name" '
@ -169,7 +169,7 @@ test_expect_success "$name" '
${remotes_git_svn}..mybranch5 && ${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" && svn_cmd up "$SVN_TREE" &&
test -f "$SVN_TREE"/exec-2.sh && test -f "$SVN_TREE"/exec-2.sh &&
test ! -L "$SVN_TREE"/exec-2.sh && test ! -h "$SVN_TREE"/exec-2.sh &&
test_cmp help "$SVN_TREE"/exec-2.sh' test_cmp help "$SVN_TREE"/exec-2.sh'
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL" name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"

View File

@ -88,7 +88,7 @@ test_expect_success 'enable broken symlink workaround' \
test_expect_success '"bar" is an empty file' 'test -f x/bar && ! test -s x/bar' test_expect_success '"bar" is an empty file' 'test -f x/bar && ! test -s x/bar'
test_expect_success 'get "bar" => symlink fix from svn' \ test_expect_success 'get "bar" => symlink fix from svn' \
'(cd x && git svn rebase)' '(cd x && git svn rebase)'
test_expect_success SYMLINKS '"bar" becomes a symlink' 'test -L x/bar' test_expect_success SYMLINKS '"bar" becomes a symlink' 'test -h x/bar'
test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" y' test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" y'