diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 17:44:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 17:44:15 (GMT) |
| commit | c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50 (patch) | |
| tree | 2c53a37a399725c552770914e01fadbd82216413 /t/t7800-difftool.sh | |
| parent | 0c72d6da31dd6ffce56989e4bcbd1b8650b1ef25 (diff) | |
| parent | d2addc3b96886bb4dee71ef36684c8010bc37d16 (diff) | |
| download | git-c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50.zip git-c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50.tar.gz git-c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50.tar.bz2 | |
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
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 7ce4cd7..42a2929 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -446,7 +446,7 @@ write_script .git/CHECK_SYMLINKS <<\EOF for f in file file2 sub/sub do echo "$f" - readlink "$2/$f" + ls -ld "$2/$f" | sed -e 's/.* -> //' done >actual EOF |