3 # Copyright (c) 2005 Junio C Hamano
6 test_description
='git-apply should handle files with incomplete lines.
13 (echo a
; echo b
) >frotz
.0
14 (echo a
; echo b
; echo c
) >frotz
.1
15 (echo a
; echo b |
tr -d '\012') >frotz
.2
16 (echo a
; echo c
; echo b |
tr -d '\012') >frotz
.3
22 test $i -eq $j && continue
23 diff -u frotz.
$i frotz.
$j |
25 /^---/s|.*|--- a/frotz|
26 /^+++/s|.*|+++ b/frotz|' >diff.
$i-$j
29 "apply diff between $i and $j" \
30 "git-apply <diff.$i-$j && diff frotz.$j frotz"