ac2e28c0a4
Some of our tests assumed a working "patch" command to produce expected results when checking "git-apply", but some systems have broken "patch". We can compare our output with expected output that is precomputed instead to sidestep this issue. Signed-off-by: Junio C Hamano <gitster@pobox.com>
23 lines
522 B
Bash
Executable File
23 lines
522 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
# Copyright (c) 2005 Robert Fitzsimons
|
|
#
|
|
|
|
test_description='git apply test for patches which require scanning forwards and backwards.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'git apply scan' '
|
|
git apply \
|
|
"$TEST_DIRECTORY/t4110/patch1.patch" \
|
|
"$TEST_DIRECTORY/t4110/patch2.patch" \
|
|
"$TEST_DIRECTORY/t4110/patch3.patch" \
|
|
"$TEST_DIRECTORY/t4110/patch4.patch" \
|
|
"$TEST_DIRECTORY/t4110/patch5.patch" &&
|
|
test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
|
|
'
|
|
|
|
test_done
|