Skip to content

Commit

Permalink
fixup??? tests: move test PNGs into t/lib-diff/
Browse files Browse the repository at this point in the history
There are six more instances we need to take care of.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Oct 13, 2021
1 parent b5efe67 commit 9c5e2f6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions t/t4108-apply-threeway.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,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 &&
Expand All @@ -247,11 +247,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 &&
Expand All @@ -262,11 +262,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 &&
Expand Down

0 comments on commit 9c5e2f6

Please sign in to comment.