You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
548 B
30 lines
548 B
#!/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
|
|
|