+3 -3

t/t3307-notes-man.sh

··· 26 ' 27 28 test_expect_success 'example 2: binary notes' ' 29 - cp "$TEST_DIRECTORY"/test4012.png . && 30 git checkout B && 31 - blob=$(git hash-object -w test4012.png) && 32 git notes --ref=logo add -C "$blob" && 33 git notes --ref=logo copy B C && 34 git notes --ref=logo show C >actual && 35 - test_cmp test4012.png actual 36 ' 37 38 test_done

··· 26 ' 27 28 test_expect_success 'example 2: binary notes' ' 29 + cp "$TEST_DIRECTORY"/test-binary-1.png . && 30 git checkout B && 31 + blob=$(git hash-object -w test-binary-1.png) && 32 git notes --ref=logo add -C "$blob" && 33 git notes --ref=logo copy B C && 34 git notes --ref=logo show C >actual && 35 + test_cmp test-binary-1.png actual 36 ' 37 38 test_done

+1 -1

t/t4012-diff-binary.sh

··· 12 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && 13 git update-index --add a b c d && 14 echo git >a && 15 - cat "$TEST_DIRECTORY"/test4012.png >b && 16 echo git >c && 17 cat b b >d' 18

··· 12 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && 13 git update-index --add a b c d && 14 echo git >a && 15 + cat "$TEST_DIRECTORY"/test-binary-1.png >b && 16 echo git >c && 17 cat b b >d' 18

+1 -1

t/t6023-merge-file.sh

··· 154 155 test_expect_success 'binary files cannot be merged' ' 156 test_must_fail git merge-file -p \ 157 - orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err && 158 grep "Cannot merge binary files" merge.err 159 ' 160

··· 154 155 test_expect_success 'binary files cannot be merged' ' 156 test_must_fail git merge-file -p \ 157 + orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err && 158 grep "Cannot merge binary files" merge.err 159 ' 160

+1 -1

t/t6027-merge-binary.sh

··· 6 7 test_expect_success setup ' 8 9 - cat "$TEST_DIRECTORY"/test4012.png >m && 10 git add m && 11 git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && 12 test_tick &&

··· 6 7 test_expect_success setup ' 8 9 + cat "$TEST_DIRECTORY"/test-binary-1.png >m && 10 git add m && 11 git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && 12 test_tick &&

+7 -7

t/t9200-git-cvsexportcommit.sh

··· 50 'mkdir A B C D E F && 51 echo hello1 >A/newfile1.txt && 52 echo hello2 >B/newfile2.txt && 53 - cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png && 54 - cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png && 55 git add A/newfile1.txt && 56 git add B/newfile2.txt && 57 git add C/newfile3.png && ··· 76 rm -f B/newfile2.txt && 77 rm -f C/newfile3.png && 78 echo Hello5 >E/newfile5.txt && 79 - cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png && 80 - cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png && 81 git add E/newfile5.txt && 82 git add F/newfile6.png && 83 git commit -a -m "Test: Remove, add and update" && ··· 165 'mkdir "G g" && 166 echo ok then >"G g/with spaces.txt" && 167 git add "G g/with spaces.txt" && \ 168 - cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \ 169 git add "G g/with spaces.png" && 170 git commit -a -m "With spaces" && 171 id=$(git rev-list --max-count=1 HEAD) && ··· 177 test_expect_success \ 178 'Update file with spaces in file name' \ 179 'echo Ok then >>"G g/with spaces.txt" && 180 - cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \ 181 git add "G g/with spaces.png" && 182 git commit -a -m "Update with spaces" && 183 id=$(git rev-list --max-count=1 HEAD) && ··· 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 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 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 && 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 git commit -a -m "Går det så går det" && \ 208 id=$(git rev-list --max-count=1 HEAD) &&

··· 50 'mkdir A B C D E F && 51 echo hello1 >A/newfile1.txt && 52 echo hello2 >B/newfile2.txt && 53 + cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png && 54 + cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png && 55 git add A/newfile1.txt && 56 git add B/newfile2.txt && 57 git add C/newfile3.png && ··· 76 rm -f B/newfile2.txt && 77 rm -f C/newfile3.png && 78 echo Hello5 >E/newfile5.txt && 79 + cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png && 80 + cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png && 81 git add E/newfile5.txt && 82 git add F/newfile6.png && 83 git commit -a -m "Test: Remove, add and update" && ··· 165 'mkdir "G g" && 166 echo ok then >"G g/with spaces.txt" && 167 git add "G g/with spaces.txt" && \ 168 + cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \ 169 git add "G g/with spaces.png" && 170 git commit -a -m "With spaces" && 171 id=$(git rev-list --max-count=1 HEAD) && ··· 177 test_expect_success \ 178 'Update file with spaces in file name' \ 179 'echo Ok then >>"G g/with spaces.txt" && 180 + cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \ 181 git add "G g/with spaces.png" && 182 git commit -a -m "Update with spaces" && 183 id=$(git rev-list --max-count=1 HEAD) && ··· 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 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 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"/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 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 git commit -a -m "Går det så går det" && \ 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