[PATCH 3/5] t2004: standardize file naming in symlink test
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Dec 24, 2014, 09:43 UTC
- Message-ID
- <1419414196-58587-4-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1419414196-58587-1-git-send-email-sunshine@sunshineco.com>
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> --- t/t2004-checkout-cache-temp.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh index 22d1a24..602fbc7 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
-- 2.2.1.267.g0ad48de