changed added/conflicted checking order
[git/mingw/4msysgit/wingit-dll.git] / t / t4101-apply-nonl.sh
blobe3443d004d026c86fd783cb8e6e3d03f22676778
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 "apply diff between $i and $j" '
25 git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
26 test_cmp frotz.$j frotz
28 done
29 done
31 test_done