git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-31 12:28:51 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

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

Browse Source 
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 <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-08-05 20:28:37 +02:00
parent f03dc970e2
commit 14fa4bf093
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
t/test-binary-1.png → t/lib-diff/test-binary-1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
t/test-binary-2.png → t/lib-diff/test-binary-2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 275 B

2
t/t3307-notes-man.sh
View File

@@ -26,7 +26,7 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
' '
test_expect_success 'example 2: binary notes' ' 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 && git checkout B &&
blob=$(git hash-object -w test-binary-1.png) && blob=$(git hash-object -w test-binary-1.png) &&
git notes --ref=logo add -C "$blob" && git notes --ref=logo add -C "$blob" &&

2
t/t3903-stash.sh
View File

@@ -1345,7 +1345,7 @@ test_expect_success 'stash -- <subdir> works with binary files' '
git reset && git reset &&
>subdir/untracked && >subdir/untracked &&
>subdir/tracked && >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 add subdir/tracked* &&
git stash -- subdir/ && git stash -- subdir/ &&
test_path_is_missing subdir/tracked && test_path_is_missing subdir/tracked &&

2
t/t4012-diff-binary.sh
View File

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

2
t/t4049-diff-stat-count.sh
View File

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

12
t/t4108-apply-threeway.sh
View File

@@ -272,11 +272,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
test_expect_success 'apply binary file patch' ' test_expect_success 'apply binary file patch' '
git reset --hard main && 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 add bin.png &&
git commit -m "add binary file" && 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 diff --binary >bin.diff &&
git reset --hard && git reset --hard &&
@@ -287,11 +287,11 @@ test_expect_success 'apply binary file patch' '
test_expect_success 'apply binary file patch with 3way' ' test_expect_success 'apply binary file patch with 3way' '
git reset --hard main && 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 add bin.png &&
git commit -m "add binary file" && 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 diff --binary >bin.diff &&
git reset --hard && git reset --hard &&
@@ -302,11 +302,11 @@ test_expect_success 'apply binary file patch with 3way' '
test_expect_success 'apply full-index patch with 3way' ' test_expect_success 'apply full-index patch with 3way' '
git reset --hard main && 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 add bin.png &&
git commit -m "add binary file" && 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 diff --full-index >bin.diff &&
git reset --hard && git reset --hard &&

4
t/t6403-merge-file.sh
View File

@@ -355,12 +355,12 @@ test_expect_success "expected conflict markers" '
test_expect_success 'binary files cannot be merged' ' test_expect_success 'binary files cannot be merged' '
test_must_fail git merge-file -p \ 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 grep "Cannot merge binary files" merge.err
' '
test_expect_success 'binary files cannot be merged with --object-id' ' 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 && git add orig.txt new1.txt test-binary-1.png &&
test_must_fail git merge-file --object-id \ test_must_fail git merge-file --object-id \
:orig.txt :test-binary-1.png :new1.txt 2> merge.err && :orig.txt :test-binary-1.png :new1.txt 2> merge.err &&

2
t/t6407-merge-binary.sh
View File

@@ -9,7 +9,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_expect_success setup ' 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 add m &&
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
test_tick && test_tick &&

14
t/t9200-git-cvsexportcommit.sh
View File

@@ -54,8 +54,8 @@ test_expect_success 'New file' '
mkdir A B C D E F && mkdir A B C D E F &&
echo hello1 >A/newfile1.txt && echo hello1 >A/newfile1.txt &&
echo hello2 >B/newfile2.txt && echo hello2 >B/newfile2.txt &&
cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png && cp "$TEST_DIRECTORY"/lib-diff/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 D/newfile4.png &&
git add A/newfile1.txt && git add A/newfile1.txt &&
git add B/newfile2.txt && git add B/newfile2.txt &&
git add C/newfile3.png && git add C/newfile3.png &&
@@ -80,8 +80,8 @@ test_expect_success 'Remove two files, add two and update two' '
rm -f B/newfile2.txt && rm -f B/newfile2.txt &&
rm -f C/newfile3.png && rm -f C/newfile3.png &&
echo Hello5 >E/newfile5.txt && echo Hello5 >E/newfile5.txt &&
cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png && cp "$TEST_DIRECTORY"/lib-diff/test-binary-2.png D/newfile4.png &&
cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png && cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png F/newfile6.png &&
git add E/newfile5.txt && git add E/newfile5.txt &&
git add F/newfile6.png && git add F/newfile6.png &&
git commit -a -m "Test: Remove, add and update" && git commit -a -m "Test: Remove, add and update" &&
@@ -169,7 +169,7 @@ test_expect_success 'New file with spaces in file name' '
mkdir "G g" && mkdir "G g" &&
echo ok then >"G g/with spaces.txt" && echo ok then >"G g/with spaces.txt" &&
git add "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 add "G g/with spaces.png" &&
git commit -a -m "With spaces" && git commit -a -m "With spaces" &&
id=$(git rev-list --max-count=1 HEAD) && id=$(git rev-list --max-count=1 HEAD) &&
@@ -181,7 +181,7 @@ test_expect_success 'New file with spaces in file name' '
test_expect_success 'Update file with spaces in file name' ' test_expect_success 'Update file with spaces in file name' '
echo Ok then >>"G g/with spaces.txt" && 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 add "G g/with spaces.png" &&
git commit -a -m "Update with spaces" && git commit -a -m "Update with spaces" &&
id=$(git rev-list --max-count=1 HEAD) && id=$(git rev-list --max-count=1 HEAD) &&
@@ -206,7 +206,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/å/ä/ö && 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 && 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 && 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 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" && \ git commit -a -m "Går det så går det" && \
id=$(git rev-list --max-count=1 HEAD) && id=$(git rev-list --max-count=1 HEAD) &&