]>
Commit | Line | Data |
---|---|---|
8b64647d JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano | |
4 | # | |
5 | ||
6 | test_description='git-apply should handle files with incomplete lines. | |
7 | ||
8 | ' | |
9 | . ./test-lib.sh | |
10 | ||
11 | # setup | |
12 | ||
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 | |
17 | ||
18 | for i in 0 1 2 3 | |
19 | do | |
20 | for j in 0 1 2 3 | |
21 | do | |
22 | test $i -eq $j && continue | |
23 | diff -u frotz.$i frotz.$j | | |
24 | sed -e ' | |
25 | /^---/s|.*|--- a/frotz| | |
26 | /^+++/s|.*|+++ b/frotz|' >diff.$i-$j | |
27 | cat frotz.$i >frotz | |
28 | test_expect_success \ | |
29 | "apply diff between $i and $j" \ | |
30 | "git-apply <diff.$i-$j && diff frotz.$j frotz" | |
31 | done | |
32 | done |