GIT 1.6.4
[git/jrn.git] / t / t4124-apply-ws-rule.sh
blobfac2093d7f20d502f41f895d2ccdfccd5e639e2b
1 #!/bin/sh
3 test_description='core.whitespace rules and git apply'
5 . ./test-lib.sh
7 prepare_test_file () {
9 # A line that has character X is touched iff RULE is in effect:
10 # X RULE
11 # ! trailing-space
12 # @ space-before-tab
13 # # indent-with-non-tab
14 sed -e "s/_/ /g" -e "s/>/ /" <<-\EOF
15 An_SP in an ordinary line>and a HT.
16 >A HT.
17 _>A SP and a HT (@).
18 _>_A SP, a HT and a SP (@).
19 _______Seven SP.
20 ________Eight SP (#).
21 _______>Seven SP and a HT (@).
22 ________>Eight SP and a HT (@#).
23 _______>_Seven SP, a HT and a SP (@).
24 ________>_Eight SP, a HT and a SP (@#).
25 _______________Fifteen SP (#).
26 _______________>Fifteen SP and a HT (@#).
27 ________________Sixteen SP (#).
28 ________________>Sixteen SP and a HT (@#).
29 _____a__Five SP, a non WS, two SP.
30 A line with a (!) trailing SP_
31 A line with a (!) trailing HT>
32 EOF
35 apply_patch () {
36 >target &&
37 sed -e "s|\([ab]\)/file|\1/target|" <patch |
38 git apply "$@"
41 test_fix () {
43 # fix should not barf
44 apply_patch --whitespace=fix || return 1
46 # find touched lines
47 diff file target | sed -n -e "s/^> //p" >fixed
49 # the changed lines are all expeced to change
50 fixed_cnt=$(wc -l <fixed)
51 case "$1" in
52 '') expect_cnt=$fixed_cnt ;;
53 ?*) expect_cnt=$(grep "[$1]" <fixed | wc -l) ;;
54 esac
55 test $fixed_cnt -eq $expect_cnt || return 1
57 # and we are not missing anything
58 case "$1" in
59 '') expect_cnt=0 ;;
60 ?*) expect_cnt=$(grep "[$1]" <file | wc -l) ;;
61 esac
62 test $fixed_cnt -eq $expect_cnt || return 1
64 # Get the patch actually applied
65 git diff-files -p target >fixed-patch
66 test -s fixed-patch && return 0
68 # Make sure it is complaint-free
69 >target
70 git apply --whitespace=error-all <fixed-patch
74 test_expect_success setup '
76 >file &&
77 git add file &&
78 prepare_test_file >file &&
79 git diff-files -p >patch &&
80 >target &&
81 git add target
85 test_expect_success 'whitespace=nowarn, default rule' '
87 apply_patch --whitespace=nowarn &&
88 diff file target
92 test_expect_success 'whitespace=warn, default rule' '
94 apply_patch --whitespace=warn &&
95 diff file target
99 test_expect_success 'whitespace=error-all, default rule' '
101 apply_patch --whitespace=error-all && return 1
102 test -s target && return 1
103 : happy
107 test_expect_success 'whitespace=error-all, no rule' '
109 git config core.whitespace -trailing,-space-before,-indent &&
110 apply_patch --whitespace=error-all &&
111 diff file target
115 test_expect_success 'whitespace=error-all, no rule (attribute)' '
117 git config --unset core.whitespace &&
118 echo "target -whitespace" >.gitattributes &&
119 apply_patch --whitespace=error-all &&
120 diff file target
124 for t in - ''
126 case "$t" in '') tt='!' ;; *) tt= ;; esac
127 for s in - ''
129 case "$s" in '') ts='@' ;; *) ts= ;; esac
130 for i in - ''
132 case "$i" in '') ti='#' ;; *) ti= ;; esac
133 rule=${t}trailing,${s}space,${i}indent
135 rm -f .gitattributes
136 test_expect_success "rule=$rule" '
137 git config core.whitespace "$rule" &&
138 test_fix "$tt$ts$ti"
141 test_expect_success "rule=$rule (attributes)" '
142 git config --unset core.whitespace &&
143 echo "target whitespace=$rule" >.gitattributes &&
144 test_fix "$tt$ts$ti"
147 done
148 done
149 done
151 create_patch () {
152 sed -e "s/_/ /" <<-\EOF
153 diff --git a/target b/target
154 index e69de29..8bd6648 100644
155 --- a/target
156 +++ b/target
157 @@ -0,0 +1,3 @@
158 +An empty line follows
160 +A line with trailing whitespace and no newline_
161 \ No newline at end of file
165 test_expect_success 'trailing whitespace & no newline at the end of file' '
166 >target &&
167 create_patch >patch-file &&
168 git apply --whitespace=fix patch-file &&
169 grep "newline$" target &&
170 grep "^$" target
173 test_done