1#!/bin/sh
2
3test_description='apply with fuzz and offset'
4
5. ./test-lib.sh
6
7dotest () {
8 name="$1" && shift &&
9 test_expect_success "$name" "
10 git checkout-index -f -q -u file &&
11 git apply $* &&
12 test_cmp expect file
13 "
14}
15
16test_expect_success setup '
17
18 for i in 1 2 3 4 5 6 7 8 9 10 11 12
19 do
20 echo $i
21 done >file &&
22 git update-index --add file &&
23 for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12
24 do
25 echo $i
26 done >file &&
27 cat file >expect &&
28 git diff >O0.diff &&
29
30 sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff &&
31 sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff &&
32 sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff &&
33
34 sed -e "s/^ 5/ S/" >F0.diff O0.diff &&
35 sed -e "s/^ 5/ S/" >F1.diff O1.diff &&
36 sed -e "s/^ 5/ S/" >F2.diff O2.diff &&
37 sed -e "s/^ 5/ S/" >F3.diff O3.diff
38
39'
40
41dotest 'unmodified patch' O0.diff
42
43dotest 'minus offset' O1.diff
44
45dotest 'plus offset' O2.diff
46
47dotest 'big offset' O3.diff
48
49dotest 'fuzz with no offset' -C2 F0.diff
50
51dotest 'fuzz with minus offset' -C2 F1.diff
52
53dotest 'fuzz with plus offset' -C2 F2.diff
54
55dotest 'fuzz with big offset' -C2 F3.diff
56
57test_done