blob: 556450609b91873efc966d36f20b84f33425b4dc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
#!/bin/sh
test_description='Test diff indent heuristic.
'
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh
# Compare two diff outputs. Ignore "index" lines, because we don't
# care about SHA-1s or file modes.
compare_diff () {
sed -e "/^index /d" <"$1" >.tmp-1
sed -e "/^index /d" <"$2" >.tmp-2
test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}
# Compare blame output using the expectation for a diff as reference.
# Only look for the lines coming from non-boundary commits.
compare_blame () {
sed -n -e "1,4d" -e "s/^\+//p" <"$1" >.tmp-1
sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2
test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}
test_expect_success 'prepare' '
cat <<-\EOF >spaces.txt &&
1
2
a
b
3
4
EOF
cat <<-\EOF >functions.c &&
1
2
/* function */
foo() {
foo
}
3
4
EOF
git add spaces.txt functions.c &&
test_tick &&
git commit -m initial &&
git branch old &&
cat <<-\EOF >spaces.txt &&
1
2
a
b
a
b
3
4
EOF
cat <<-\EOF >functions.c &&
1
2
/* function */
bar() {
foo
}
/* function */
foo() {
foo
}
3
4
EOF
git add spaces.txt functions.c &&
test_tick &&
git commit -m initial &&
git branch new &&
tr "_" " " <<-\EOF >spaces-expect &&
diff --git a/spaces.txt b/spaces.txt
--- a/spaces.txt
+++ b/spaces.txt
@@ -3,5 +3,8 @@
a
_
b
+a
+
+b
3
4
EOF
tr "_" " " <<-\EOF >spaces-compacted-expect &&
diff --git a/spaces.txt b/spaces.txt
--- a/spaces.txt
+++ b/spaces.txt
@@ -2,6 +2,9 @@
2
a
_
+b
+a
+
b
3
4
EOF
tr "_" " " <<-\EOF >functions-expect &&
diff --git a/functions.c b/functions.c
--- a/functions.c
+++ b/functions.c
@@ -1,6 +1,11 @@
1
2
/* function */
+bar() {
+ foo
+}
+
+/* function */
foo() {
foo
}
EOF
tr "_" " " <<-\EOF >functions-compacted-expect
diff --git a/functions.c b/functions.c
--- a/functions.c
+++ b/functions.c
@@ -1,5 +1,10 @@
1
2
+/* function */
+bar() {
+ foo
+}
+
/* function */
foo() {
foo
EOF
'
test_expect_success 'diff: ugly spaces' '
git diff old new -- spaces.txt >out &&
compare_diff spaces-expect out
'
test_expect_success 'diff: nice spaces with --indent-heuristic' '
git diff --indent-heuristic old new -- spaces.txt >out-compacted &&
compare_diff spaces-compacted-expect out-compacted
'
test_expect_success 'diff: nice spaces with diff.indentHeuristic' '
git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
compare_diff spaces-compacted-expect out-compacted2
'
test_expect_success 'diff: --no-indent-heuristic overrides config' '
git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
compare_diff spaces-expect out2
'
test_expect_success 'diff: --indent-heuristic with --patience' '
git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
compare_diff spaces-compacted-expect out-compacted3
'
test_expect_success 'diff: --indent-heuristic with --histogram' '
git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&
compare_diff spaces-compacted-expect out-compacted4
'
test_expect_success 'diff: ugly functions' '
git diff old new -- functions.c >out &&
compare_diff functions-expect out
'
test_expect_success 'diff: nice functions with --indent-heuristic' '
git diff --indent-heuristic old new -- functions.c >out-compacted &&
compare_diff functions-compacted-expect out-compacted
'
test_expect_success 'blame: ugly spaces' '
git blame old..new -- spaces.txt >out-blame &&
compare_blame spaces-expect out-blame
'
test_expect_success 'blame: nice spaces with --indent-heuristic' '
git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
compare_blame spaces-compacted-expect out-blame-compacted
'
test_expect_success 'blame: nice spaces with diff.indentHeuristic' '
git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
compare_blame spaces-compacted-expect out-blame-compacted2
'
test_expect_success 'blame: --no-indent-heuristic overrides config' '
git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame2 &&
git blame old..new -- spaces.txt >out-blame &&
compare_blame spaces-expect out-blame2
'
test_done
|
