diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:10 -0700 |
| commit | bb8f6de064a2b92febe06c5cbfcf98c686dce8a4 (patch) | |
| tree | 8fc741454bdeaa37b211ede730c58f72bc36e5c9 /t/t4005-diff-rename-2.sh | |
| parent | Merge branch 'jk/diffcore-rename-duplicate' into maint (diff) | |
| parent | test_ln_s_add: refresh stat info of fake symbolic links (diff) | |
| download | tgif-bb8f6de064a2b92febe06c5cbfcf98c686dce8a4.tar.xz | |
Merge branch 'jc/diff-test-updates' into maint
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 7d2c6e13a2..135addbfbd 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 |