From: Eric Sunshine <sunshine@sunshineco.com>
Date: Wed, 24 Dec 2014 09:43:14 +0000 (-0500)
Subject: t2004: standardize file naming in symlink test
X-Git-Tag: v2.3.0-rc0~8^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/66e28e93bb817791cff837df9df0469962e47618

t2004: standardize file naming in symlink test

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>
---

diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index 22d1a248b6..602fbc753c 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -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