tests: use t/lib-diff/* consistently

The idea of copying README and COPYING into t/lib-diff/ was to step away
from using files from outside t/ in tests. Let's really make sure that
we use the files from t/lib-diff/ instead of other versions of those
files.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

t/t4022-diff-rewrite.sh

@@ -6,12 +6,12 @@ test_description='rewrite diff'
 
 test_expect_success setup '
 
-	cat "$TEST_DIRECTORY"/../COPYING >test &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >test &&
 	git add test &&
 	tr \
 	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
 	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-	  <"$TEST_DIRECTORY"/../COPYING >test &&
+	  <"$TEST_DIRECTORY"/lib-diff/COPYING >test &&
 	echo "to be deleted" >test2 &&
 	blob=$(git hash-object test2) &&
 	blob=$(git rev-parse --short $blob) &&

t/t4023-diff-rename-typechange.sh

@@ -7,21 +7,21 @@ test_description='typechange rename detection'
 test_expect_success setup '
 
 	rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
 	test_ln_s_add linklink bar &&
 	git add foo &&
 	git commit -a -m Initial &&
 	git tag one &&
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >bar &&
 	test_ln_s_add linklink foo &&
 	git add bar &&
 	git commit -a -m Second &&
 	git tag two &&
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
 	git add foo &&
 	git commit -a -m Third &&
 	git tag three &&
@@ -35,15 +35,15 @@ test_expect_success setup '
 	# This is purely for sanity check
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
-	cat "$TEST_DIRECTORY"/../Makefile >bar &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
+	cat "$TEST_DIRECTORY"/lib-diff/README >bar &&
 	git add foo bar &&
 	git commit -a -m Fifth &&
 	git tag five &&
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../Makefile >foo &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	cat "$TEST_DIRECTORY"/lib-diff/README >foo &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >bar &&
 	git add foo bar &&
 	git commit -a -m Sixth &&
 	git tag six

t/t7001-mv.sh

@@ -5,7 +5,7 @@ test_description='git mv in subdirs'
 
 test_expect_success 'prepare reference tree' '
 	mkdir path0 path1 &&
-	cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+	cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
 	git add path0/COPYING &&
 	git commit -m add -a
 '
@@ -107,7 +107,7 @@ test_expect_success 'clean up' '
 '
 
 test_expect_success 'adding another file' '
-	cp "$TEST_DIRECTORY"/../README.md path0/README &&
+	cp "$TEST_DIRECTORY"/lib-diff/README path0/ &&
 	git add path0/README &&
 	git commit -m add2 -a
 '

t/t7060-wtstatus.sh

@@ -64,7 +64,7 @@ EOF
 
 test_expect_success 'rename & unmerged setup' '
 	git rm -f -r . &&
-	cat "$TEST_DIRECTORY/README" >ONE &&
+	cat "$TEST_DIRECTORY/lib-diff/README" >ONE &&
 	git add ONE &&
 	test_tick &&
 	git commit -m "One commit with ONE" &&

t/t7101-reset-empty-subdirs.sh

@@ -8,18 +8,18 @@ test_description='git reset should cull empty subdirs'
 
 test_expect_success 'creating initial files' '
      mkdir path0 &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+     cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
      git add path0/COPYING &&
      git commit -m add -a
 '
 
 test_expect_success 'creating second files' '
      mkdir path1 &&
      mkdir path1/path2 &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+     cp "$TEST_DIRECTORY"/lib-diff/COPYING path1/path2/COPYING &&
+     cp "$TEST_DIRECTORY"/lib-diff/COPYING path1/COPYING &&
+     cp "$TEST_DIRECTORY"/lib-diff/COPYING COPYING &&
+     cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING-TOO &&
      git add path1/path2/COPYING &&
      git add path1/COPYING &&
      git add COPYING &&