2005-07-23 00:56:39 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
test_description='git apply should handle files with incomplete lines.
|
2005-07-23 00:56:39 +08:00
|
|
|
|
|
|
|
'
|
|
|
|
. ./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" \
|
2007-07-03 13:52:14 +08:00
|
|
|
"git apply <../t4101/diff.$i-$j && diff frotz.$j frotz"
|
2005-07-23 00:56:39 +08:00
|
|
|
done
|
|
|
|
done
|
2005-08-11 10:15:02 +08:00
|
|
|
|
|
|
|
test_done
|