t2004: standardize file naming in symlink test
authorEric Sunshine <sunshine@sunshineco.com>
Wed, 24 Dec 2014 09:43:14 +0000 (04:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2014 18:54:42 +0000 (10:54 -0800)
Update "symlink" test to use the common file naming scheme so that its
temporary files can be cleaned up by the "rm -f path*" idiom employed by
other tests in this script.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2004-checkout-cache-temp.sh
index 22d1a248b65ad7ce4d1a2d51e4b88169d533d98b..602fbc753cf6873a303f285a777238f9ce0dc8ac 100755 (executable)
@@ -197,13 +197,13 @@ 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 &&
+       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_done