diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:16 -0700 |
| commit | 3edaee74fdd804035d5f59c35c50ef05779fb73b (patch) | |
| tree | ccfbbb6eef82b8ec3228cedcebf5727813a08b22 | |
| parent | f6a729f344da03d9da07848ab33d98643976ed22 (diff) | |
| parent | d2addc3b96886bb4dee71ef36684c8010bc37d16 (diff) | |
| download | git-3edaee74fdd804035d5f59c35c50ef05779fb73b.tar.gz | |
Merge branch 'ak/t7800-wo-readlink'
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
| -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 7ce4cd753e..42a2929835 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 |