summaryrefslogtreecommitdiff
path: root/t/t4005-diff-rename-2.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-15 13:44:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-15 15:38:10 -0800
commit459b8d22e544b3876a2270ee7290c289a39ebbb2 (patch)
tree64fef4aea9cfc2238ab2240d4586dca1484fc1e9 /t/t4005-diff-rename-2.sh
parentt4010: correct expected object names (diff)
downloadtgif-459b8d22e544b3876a2270ee7290c289a39ebbb2.tar.xz
tests: do not borrow from COPYING and README from the real source
These two files have been modified since the tests started using as test input, making the exact object names they expect to be different from what actually happens in the trash repository they use to run tests. Instead, take a snapshot of these two files and keep them in t/diff-lib/ so that we can update the real ones without having to worry about breaking tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4005-diff-rename-2.sh')
-rwxr-xr-xt/t4005-diff-rename-2.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 77d7f4946f..3b23dc4fd5 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