Merge branch 'jc/apply-ws-fix-expands'

diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index 28e50d69d5f86845e85cdf54233e088900e4bdd0..a12afe93f32948dd994d55418ed93485757d2ba8 100755 (executable)
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -197,16 +197,25 @@ test_expect_success 'checkout --temp within subdir' '
 
 test_expect_success 'checkout --temp symlink' '
        rm -f path* .merge_* actual .git/index &&
-       test_ln_s_add b a &&
-       t4=$(git write-tree) &&
-       rm -f .git/index &&
-       git read-tree $t4 &&
+       test_ln_s_add path7 path6 &&
        git checkout-index --temp -a >actual &&
        test_line_count = 1 actual &&
-       test $(cut "-d  " -f2 actual) = a &&
+       test $(cut "-d  " -f2 actual) = path6 &&
        p=$(cut "-d     " -f1 actual) &&
        test -f $p &&
-       test $(cat $p) = b
+       test $(cat $p) = path7
+'
+
+test_expect_success 'emit well-formed relative path' '
+       rm -f path* .merge_* actual .git/index &&
+       >path0123456789 &&
+       git update-index --add path0123456789 &&
+       (
+               cd asubdir &&
+               git checkout-index --temp -- ../path0123456789 >actual &&
+               test_line_count = 1 actual &&
+               test $(cut "-d  " -f2 actual) = ../path0123456789
+       )
 '
 
 test_done