diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 20:45:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 20:45:43 (GMT) |
| commit | fa8baa4b2acf6f8be8f28bf84493e0889e45eb91 (patch) | |
| tree | 2bce03d86ae374800d0f201dba9c2b681f5365f0 /t/t4005-diff-rename-2.sh | |
| parent | 8a6444d50ea73350ae7e6083ecc63393749e5bb0 (diff) | |
| parent | 817d03e10552c03fce7483df5034d72f883b2fab (diff) | |
| download | git-fa8baa4b2acf6f8be8f28bf84493e0889e45eb91.zip git-fa8baa4b2acf6f8be8f28bf84493e0889e45eb91.tar.gz git-fa8baa4b2acf6f8be8f28bf84493e0889e45eb91.tar.bz2 | |
Merge branch 'jc/diff-test-updates'
Test clean-up.
* jc/diff-test-updates:
test_ln_s_add: refresh stat info of fake symbolic links
t4008: modernise style
t/diff-lib: check exact object names in compare_diff_raw
tests: do not borrow from COPYING and README from the real source
t4010: correct expected object names
t9300: correct expected object names
t4008: correct stale comments
Diffstat (limited to 't/t4005-diff-rename-2.sh')
| -rwxr-xr-x | t/t4005-diff-rename-2.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 7d2c6e1..135addb 100755 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -11,7 +11,7 @@ test_description='Same rename detection as t4003 but testing diff-raw. test_expect_success \ 'prepare reference tree' \ - 'cat "$TEST_DIRECTORY"/../COPYING >COPYING && + 'cat "$TEST_DIRECTORY"/diff-lib/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 "$TEST_DIRECTORY"/../COPYING >COPYING && + 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && git update-index --add --remove COPYING COPYING.1' git diff-index -C --find-copies-harder $tree >current |