Skip to content

Commit c4cdde4

Browse files
committed
Merge branch 'ak/t7800-wo-readlink' into maint
One among four invocations of readlink(1) in our test suite has been rewritten so that the test can run on systems without the command (others are in valgrind test framework and t9802). * ak/t7800-wo-readlink: t7800: readlink may not be available
2 parents 0c72d6d + d2addc3 commit c4cdde4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t7800-difftool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ write_script .git/CHECK_SYMLINKS <<\EOF
446446
for f in file file2 sub/sub
447447
do
448448
echo "$f"
449-
readlink "$2/$f"
449+
ls -ld "$2/$f" | sed -e 's/.* -> //'
450450
done >actual
451451
EOF
452452

0 commit comments

Comments
 (0)