diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:40:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:40:59 -0700 |
| commit | f02fa3360510c6a2b75d2b52b8d1636788ab2605 (patch) | |
| tree | 08b0cdb22e425d50d804d5ea1d301217b2be0a2c /t/t4005-diff-rename-2.sh | |
| parent | 6da9d5bf47de3fdea23447259a2f1ab220a1b18f (diff) | |
| parent | bfdbee98109c5ad2dbbc392e7eed1ae688acc039 (diff) | |
| download | git-f02fa3360510c6a2b75d2b52b8d1636788ab2605.tar.gz | |
Merge branch 'jc/test-deeper'
* jc/test-deeper:
tests: use $TEST_DIRECTORY to refer to the t/ directory
Diffstat (limited to 't/t4005-diff-rename-2.sh')
| -rwxr-xr-x | t/t4005-diff-rename-2.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 6630017312..1ba359d478 100755 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -7,11 +7,11 @@ test_description='Same rename detection as t4003 but testing diff-raw. ' . ./test-lib.sh -. ../diff-lib.sh ;# test-lib chdir's into trash +. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash test_expect_success \ 'prepare reference tree' \ - 'cat ../../COPYING >COPYING && + 'cat "$TEST_DIRECTORY"/../COPYING >COPYING && echo frotz >rezrov && git update-index --add COPYING rezrov && tree=$(git write-tree) && @@ -71,7 +71,7 @@ test_expect_success \ test_expect_success \ 'prepare work tree once again' \ - 'cat ../../COPYING >COPYING && + 'cat "$TEST_DIRECTORY"/../COPYING >COPYING && git update-index --add --remove COPYING COPYING.1' git diff-index -C --find-copies-harder $tree >current |