Ensure `git-pull` fails if `git-merge` fails.
[git/dscho.git] / t / t4101-apply-nonl.sh
blob026fac8c5534c5a269c1a89088bbe97a4dd30b87
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='git-apply should handle files with incomplete lines.
9 . ./test-lib.sh
11 # setup
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
18 for i in 0 1 2 3
20 for j in 0 1 2 3
22 test $i -eq $j && continue
23 cat frotz.$i >frotz
24 test_expect_success \
25 "apply diff between $i and $j" \
26 "git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz"
27 done
28 done
30 test_done