Merge branch 'jk/checkout-attribute-lookup'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index fb0027325d3e1aa031a5cb54f9842a28b84dca04..c6d6b1c99fe98b7dc692eaf3828a08696bfb5e10 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' '
 '
 
 test_expect_success PERL 'custom tool commands override built-ins' '
-       test_config difftool.defaults.cmd "cat \"\$REMOTE\"" &&
+       test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
        echo master >expect &&
-       git difftool --tool defaults --no-prompt branch >actual &&
+       git difftool --tool vimdiff --no-prompt branch >actual &&
        test_cmp expect actual
 '
 
@@ -340,6 +340,28 @@ test_expect_success PERL 'difftool --dir-diff' '
        stdin_contains file <output
 '
 
+write_script .git/CHECK_SYMLINKS <<\EOF
+for f in file file2 sub/sub
+do
+       echo "$f"
+       readlink "$2/$f"
+done >actual
+EOF
+
+test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstaged changes' '
+       cat >expect <<-EOF &&
+       file
+       $(pwd)/file
+       file2
+       $(pwd)/file2
+       sub/sub
+       $(pwd)/sub/sub
+       EOF
+       git difftool --dir-diff --symlink \
+               --extcmd "./.git/CHECK_SYMLINKS" branch HEAD &&
+       test_cmp actual expect
+'
+
 test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
        git difftool --dir-diff --prompt --extcmd ls branch >output &&
        stdin_contains sub <output &&