tests: move test PNGs into t/lib-diff/

We already have a directory where we store files intended for use by
multiple test scripts. The same directory is a better home for the
test-binary-*.png files than t/.

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

Author: dscho

t/test-binary-1.png renamed to t/lib-diff/test-binary-1.png

@@ -27,7 +27,7 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
 '
 
 test_expect_success 'example 2: binary notes' '
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
 	git checkout B &&
 	blob=$(git hash-object -w test-binary-1.png) &&
 	git notes --ref=logo add -C "$blob" &&

t/test-binary-2.png renamed to t/lib-diff/test-binary-2.png

@@ -1346,7 +1346,7 @@ test_expect_success 'stash -- <subdir> works with binary files' '
 	git reset &&
 	>subdir/untracked &&
 	>subdir/tracked &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png subdir/tracked-binary &&
 	git add subdir/tracked* &&
 	git stash -- subdir/ &&
 	test_path_is_missing subdir/tracked &&

t/t3307-notes-man.sh

@@ -20,7 +20,7 @@ test_expect_success 'prepare repository' '
 	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
 	git update-index --add a b c d &&
 	echo git >a &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >b &&
 	echo git >c &&
 	cat b b >d
 '

t/t3903-stash.sh

@@ -34,7 +34,7 @@ test_expect_success 'binary changes do not count in lines' '
 	git reset --hard &&
 	echo a >a &&
 	echo c >c &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >d &&
 	cat >expect <<-\EOF &&
 	 a | 1 +
 	 c | 1 +

t/t4012-diff-binary.sh

@@ -273,11 +273,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
 
 test_expect_success 'apply binary file patch' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --binary >bin.diff &&
 	git reset --hard &&
@@ -288,11 +288,11 @@ test_expect_success 'apply binary file patch' '
 
 test_expect_success 'apply binary file patch with 3way' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --binary >bin.diff &&
 	git reset --hard &&
@@ -303,11 +303,11 @@ test_expect_success 'apply binary file patch with 3way' '
 
 test_expect_success 'apply full-index patch with 3way' '
 	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
 	git add bin.png &&
 	git commit -m "add binary file" &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
 
 	git diff --full-index >bin.diff &&
 	git reset --hard &&

t/t4049-diff-stat-count.sh

@@ -356,12 +356,12 @@ test_expect_success "expected conflict markers" '
 
 test_expect_success 'binary files cannot be merged' '
 	test_must_fail git merge-file -p \
-		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
+		orig.txt "$TEST_DIRECTORY"/lib-diff/test-binary-1.png new1.txt 2> merge.err &&
 	grep "Cannot merge binary files" merge.err
 '
 
 test_expect_success 'binary files cannot be merged with --object-id' '
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
 	git add orig.txt new1.txt test-binary-1.png &&
 	test_must_fail git merge-file --object-id \
 		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&

t/t4108-apply-threeway.sh

@@ -10,7 +10,7 @@ TEST_PASSES_SANITIZE_LEAK=true
 
 test_expect_success setup '
 
-	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >m &&
 	git add m &&
 	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
 	test_tick &&

t/t6403-merge-file.sh

@@ -55,8 +55,8 @@ test_expect_success 'New file' '
 	mkdir A B C D E F &&
 	echo hello1 >A/newfile1.txt &&
 	echo hello2 >B/newfile2.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png C/newfile3.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png D/newfile4.png &&
 	git add A/newfile1.txt &&
 	git add B/newfile2.txt &&
 	git add C/newfile3.png &&
@@ -81,8 +81,8 @@ test_expect_success 'Remove two files, add two and update two' '
 	rm -f B/newfile2.txt &&
 	rm -f C/newfile3.png &&
 	echo Hello5  >E/newfile5.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-2.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png F/newfile6.png &&
 	git add E/newfile5.txt &&
 	git add F/newfile6.png &&
 	git commit -a -m "Test: Remove, add and update" &&
@@ -170,7 +170,7 @@ test_expect_success 'New file with spaces in file name' '
 	mkdir "G g" &&
 	echo ok then >"G g/with spaces.txt" &&
 	git add "G g/with spaces.txt" && \
-	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png "G g/with spaces.png" && \
 	git add "G g/with spaces.png" &&
 	git commit -a -m "With spaces" &&
 	id=$(git rev-list --max-count=1 HEAD) &&
@@ -182,7 +182,7 @@ test_expect_success 'New file with spaces in file name' '
 
 test_expect_success 'Update file with spaces in file name' '
 	echo Ok then >>"G g/with spaces.txt" &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
+	cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >>"G g/with spaces.png" && \
 	git add "G g/with spaces.png" &&
 	git commit -a -m "Update with spaces" &&
 	id=$(git rev-list --max-count=1 HEAD) &&
@@ -207,7 +207,7 @@ test_expect_success !MINGW 'File with non-ascii file name' '
 	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
 	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
 	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
 	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
 	git commit -a -m "Går det så går det" && \
 	id=$(git rev-list --max-count=1 HEAD) &&