Skip to content

Commit 6589d1a

Browse files
committed
fixup??? tests: move test PNGs into t/lib-diff/
There are six more instances we need to take care of. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 0f9280a commit 6589d1a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t4108-apply-threeway.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
232232

233233
test_expect_success 'apply binary file patch' '
234234
git reset --hard main &&
235-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
235+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
236236
git add bin.png &&
237237
git commit -m "add binary file" &&
238238
239-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
239+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
240240
241241
git diff --binary >bin.diff &&
242242
git reset --hard &&
@@ -247,11 +247,11 @@ test_expect_success 'apply binary file patch' '
247247

248248
test_expect_success 'apply binary file patch with 3way' '
249249
git reset --hard main &&
250-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
250+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
251251
git add bin.png &&
252252
git commit -m "add binary file" &&
253253
254-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
254+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
255255
256256
git diff --binary >bin.diff &&
257257
git reset --hard &&
@@ -262,11 +262,11 @@ test_expect_success 'apply binary file patch with 3way' '
262262

263263
test_expect_success 'apply full-index patch with 3way' '
264264
git reset --hard main &&
265-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
265+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
266266
git add bin.png &&
267267
git commit -m "add binary file" &&
268268
269-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
269+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
270270
271271
git diff --full-index >bin.diff &&
272272
git reset --hard &&

0 commit comments

Comments
 (0)