Add test_path_is_file_not_symlink(), test_path_is_dir_not_symlink()
and test_path_is_symlink(). Case of use for the first one
in test t/t3903-stash.sh to replace "test -f" because that function
explicitly want the file not to be a symlink by parsing the output
of "ls -l". Make the code more readable and give more friendly error
message.
Signed-off-by: COGONI Guillaume <cogoni.guillaume@xxxxxxxxx>
Co-authored-by: BRESSAT Jonathan <git.jonathan.bressat@xxxxxxxxx>
---
t/t3903-stash.sh | 15 ++++++---------
t/test-lib-functions.sh | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 11a0856873..0ec19a4499 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -390,10 +390,9 @@ test_expect_success SYMLINKS 'stash file to symlink' '
rm file &&
ln -s file2 file &&
git stash save "file to symlink" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ git stash apply
'
test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
@@ -401,10 +400,9 @@ test_expect_success SYMLINKS 'stash file to symlink (stage rm)' '
git rm file &&
ln -s file2 file &&
git stash save "file to symlink (stage rm)" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ git stash apply
'
test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
@@ -413,10 +411,9 @@ test_expect_success SYMLINKS 'stash file to symlink (full stage)' '
ln -s file2 file &&
git add file &&
git stash save "file to symlink (full stage)" &&
- test -f file &&
+ test_path_is_file_not_symlink file &&
test bar = "$(cat file)" &&
- git stash apply &&
- case "$(ls -l file)" in *" file -> file2") :;; *) false;; esac
+ git stash apply
'
# This test creates a commit with a symlink used for the following tests
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 85385d2ede..61fc5f37e3 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -856,6 +856,16 @@ test_path_is_file () {
fi
}
+test_path_is_file_not_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ test_path_is_file "$1" &&
+ if ! test ! -h "$1"
+ then
+ echo "$1 is a symbolic link"
+ false
+ fi
+}
+
test_path_is_dir () {
test "$#" -ne 1 && BUG "1 param"
if ! test -d "$1"
@@ -865,6 +875,16 @@ test_path_is_dir () {
fi
}
+test_path_is_dir_not_symlink () {
+ test "$#" -ne 1 && BUG "1 param"
+ test_path_is_dir "$1" &&
+ if ! test ! -h "$1"
+ then
+ echo "$1 is a symbolic link"
+ false
+ fi
+}
+
test_path_exists () {
test "$#" -ne 1 && BUG "1 param"
if ! test -e "$1"
--
2.25.1
