freshlybakedca.ke / git
Git fork
fork atom

tests: cleanup binary test vector files

The test4012.png test vector file that was originally used for t4012 to
check operations on binary files was later reused in other tests, making
it no longer consistent to name it after a specific test. Rename it to more
generic "test-binary-1.png".

While at it, rename test9200b to "test-binary-2.png" (even though it is
only used by t9200).

Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Vitaliy Ivanov and committed by
Junio C Hamano b5967f82 d28790dc

+13 -13
unified split
+3 -3
t/t3307-notes-man.sh
··· 26 26 ' 27 27 28 28 test_expect_success 'example 2: binary notes' ' 29 - cp "$TEST_DIRECTORY"/test4012.png . && 29 + cp "$TEST_DIRECTORY"/test-binary-1.png . && 30 30 git checkout B && 31 - blob=$(git hash-object -w test4012.png) && 31 + blob=$(git hash-object -w test-binary-1.png) && 32 32 git notes --ref=logo add -C "$blob" && 33 33 git notes --ref=logo copy B C && 34 34 git notes --ref=logo show C >actual && 35 - test_cmp test4012.png actual 35 + test_cmp test-binary-1.png actual 36 36 ' 37 37 38 38 test_done
+1 -1
t/t4012-diff-binary.sh
··· 12 12 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && 13 13 git update-index --add a b c d && 14 14 echo git >a && 15 - cat "$TEST_DIRECTORY"/test4012.png >b && 15 + cat "$TEST_DIRECTORY"/test-binary-1.png >b && 16 16 echo git >c && 17 17 cat b b >d' 18 18
+1 -1
t/t6023-merge-file.sh
··· 154 154 155 155 test_expect_success 'binary files cannot be merged' ' 156 156 test_must_fail git merge-file -p \ 157 - orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err && 157 + orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err && 158 158 grep "Cannot merge binary files" merge.err 159 159 ' 160 160
+1 -1
t/t6027-merge-binary.sh
··· 6 6 7 7 test_expect_success setup ' 8 8 9 - cat "$TEST_DIRECTORY"/test4012.png >m && 9 + cat "$TEST_DIRECTORY"/test-binary-1.png >m && 10 10 git add m && 11 11 git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && 12 12 test_tick &&
+7 -7
t/t9200-git-cvsexportcommit.sh
··· 50 50 'mkdir A B C D E F && 51 51 echo hello1 >A/newfile1.txt && 52 52 echo hello2 >B/newfile2.txt && 53 - cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png && 54 - cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png && 53 + cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png && 54 + cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png && 55 55 git add A/newfile1.txt && 56 56 git add B/newfile2.txt && 57 57 git add C/newfile3.png && ··· 76 76 rm -f B/newfile2.txt && 77 77 rm -f C/newfile3.png && 78 78 echo Hello5 >E/newfile5.txt && 79 - cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png && 80 - cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png && 79 + cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png && 80 + cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png && 81 81 git add E/newfile5.txt && 82 82 git add F/newfile6.png && 83 83 git commit -a -m "Test: Remove, add and update" && ··· 165 165 'mkdir "G g" && 166 166 echo ok then >"G g/with spaces.txt" && 167 167 git add "G g/with spaces.txt" && \ 168 - cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \ 168 + cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \ 169 169 git add "G g/with spaces.png" && 170 170 git commit -a -m "With spaces" && 171 171 id=$(git rev-list --max-count=1 HEAD) && ··· 177 177 test_expect_success \ 178 178 'Update file with spaces in file name' \ 179 179 'echo Ok then >>"G g/with spaces.txt" && 180 - cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \ 180 + cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \ 181 181 git add "G g/with spaces.png" && 182 182 git commit -a -m "Update with spaces" && 183 183 id=$(git rev-list --max-count=1 HEAD) && ··· 202 202 '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/å/ä/ö && 203 203 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 && 204 204 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 && 205 - cp "$TEST_DIRECTORY"/test9200a.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 && 205 + 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 && 206 206 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 && 207 207 git commit -a -m "Går det så går det" && \ 208 208 id=$(git rev-list --max-count=1 HEAD) &&
t/test4012.png t/test-binary-1.png
t/test9200a.png

This is a binary file and will not be displayed.

t/test9200b.png t/test-binary-2.png