diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2014-12-24 04:43:14 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-12-29 10:54:42 -0800 |
| commit | 66e28e93bb817791cff837df9df0469962e47618 (patch) | |
| tree | 45110333b7e138715f297a9191040a51c7bab35e | |
| parent | t2004: drop unnecessary write-tree/read-tree (diff) | |
| download | tgif-66e28e93bb817791cff837df9df0469962e47618.tar.xz | |
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>
| -rwxr-xr-x | t/t2004-checkout-cache-temp.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |