mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
f0338bbd82
Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
31 lines
548 B
Bash
Executable file
31 lines
548 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git-apply should handle files with incomplete lines.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
# setup
|
|
|
|
(echo a; echo b) >frotz.0
|
|
(echo a; echo b; echo c) >frotz.1
|
|
(echo a; echo b | tr -d '\012') >frotz.2
|
|
(echo a; echo c; echo b | tr -d '\012') >frotz.3
|
|
|
|
for i in 0 1 2 3
|
|
do
|
|
for j in 0 1 2 3
|
|
do
|
|
test $i -eq $j && continue
|
|
cat frotz.$i >frotz
|
|
test_expect_success \
|
|
"apply diff between $i and $j" \
|
|
"git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz"
|
|
done
|
|
done
|
|
|
|
test_done
|