34 lines
647 B
34 lines
647 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 |
|
diff -u frotz.$i frotz.$j | |
|
sed -e ' |
|
/^---/s|.*|--- a/frotz| |
|
/^+++/s|.*|+++ b/frotz|' >diff.$i-$j |
|
cat frotz.$i >frotz |
|
test_expect_success \ |
|
"apply diff between $i and $j" \ |
|
"git-apply <diff.$i-$j && diff frotz.$j frotz" |
|
done |
|
done |
|
|
|
test_done
|
|
|