summaryrefslogtreecommitdiffstats
path: root/t/lib-diff-alternative.sh
blob: c4dc2d46dc1ef4d3c95bda858d208045ded864c2 (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
217
218
219
220
221
222
223
224
225
226
227
# Helpers shared by the test scripts for diff algorithms (patience,
# histogram, etc).

test_diff_frobnitz() {
	cat >file1 <<\EOF
#include <stdio.h>

// Frobs foo heartily
int frobnitz(int foo)
{
    int i;
    for(i = 0; i < 10; i++)
    {
        printf("Your answer is: ");
        printf("%d\n", foo);
    }
}

int fact(int n)
{
    if(n > 1)
    {
        return fact(n-1) * n;
    }
    return 1;
}

int main(int argc, char **argv)
{
    frobnitz(fact(10));
}
EOF

	cat >file2 <<\EOF
#include <stdio.h>

int fib(int n)
{
    if(n > 2)
    {
        return fib(n-1) + fib(n-2);
    }
    return 1;
}

// Frobs foo heartily
int frobnitz(int foo)
{
    int i;
    for(i = 0; i < 10; i++)
    {
        printf("%d\n", foo);
    }
}

int main(int argc, char **argv)
{
    frobnitz(fib(10));
}
EOF

	file1=$(git rev-parse --short $(git hash-object file1))
	file2=$(git rev-parse --short $(git hash-object file2))
	cat >expect <<EOF
diff --git a/file1 b/file2
index $file1..$file2 100644
--- a/file1
+++ b/file2
@@ -1,26 +1,25 @@
 #include <stdio.h>
 
+int fib(int n)
+{
+    if(n > 2)
+    {
+        return fib(n-1) + fib(n-2);
+    }
+    return 1;
+}
+
 // Frobs foo heartily
 int frobnitz(int foo)
 {
     int i;
     for(i = 0; i < 10; i++)
     {
-        printf("Your answer is: ");
         printf("%d\n", foo);
     }
 }
 
-int fact(int n)
-{
-    if(n > 1)
-    {
-        return fact(n-1) * n;
-    }
-    return 1;
-}
-
 int main(int argc, char **argv)
 {
-    frobnitz(fact(10));
+    frobnitz(fib(10));
 }
EOF

	cat >expect_diffstat <<EOF
 file1 => file2 | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
EOF

	STRATEGY=$1

	test_expect_success "setup attributes files for tests with $STRATEGY" '
		git checkout -b master &&
		echo "file* diff=driver" >.gitattributes &&
		git add file1 file2 .gitattributes &&
		git commit -m "adding files" &&
		git checkout -b branchA &&
		echo "file* diff=driverA" >.gitattributes &&
		git add .gitattributes &&
		git commit -m "adding driverA as diff driver" &&
		git checkout master &&
		git clone --bare --no-local . bare.git
	'

	test_expect_success "$STRATEGY diff from attributes" '
		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
		test_cmp expect output
	'

	test_expect_success "diff from attributes with bare repo with source" '
		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
			-c diff.driverA.algorithm=$STRATEGY \
			diff HEAD:file1 HEAD:file2 >output &&
		test_cmp expect output
	'

	test_expect_success "diff from attributes with bare repo with invalid source" '
		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
			HEAD:file1 HEAD:file2
	'

	test_expect_success "$STRATEGY diff from attributes has valid diffstat" '
		echo "file* diff=driver" >.gitattributes &&
		git config diff.driver.algorithm "$STRATEGY" &&
		test_must_fail git diff --stat --no-index file1 file2 > output &&
		test_cmp expect_diffstat output
	'

	test_expect_success "$STRATEGY diff" '
		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
		test_cmp expect output
	'

	test_expect_success "$STRATEGY diff command line precedence before attributes" '
		echo "file* diff=driver" >.gitattributes &&
		git config diff.driver.algorithm myers &&
		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
		test_cmp expect output
	'

	test_expect_success "$STRATEGY diff attributes precedence before config" '
		git config diff.algorithm default &&
		echo "file* diff=driver" >.gitattributes &&
		git config diff.driver.algorithm "$STRATEGY" &&
		test_must_fail git diff --no-index file1 file2 > output &&
		test_cmp expect output
	'

	test_expect_success "$STRATEGY diff output is valid" '
		mv file2 expect &&
		git apply < output &&
		test_cmp expect file2
	'
}

test_diff_unique() {
	cat >uniq1 <<\EOF
1
2
3
4
5
6
EOF

	cat >uniq2 <<\EOF
a
b
c
d
e
f
EOF

	uniq1=$(git rev-parse --short $(git hash-object uniq1))
	uniq2=$(git rev-parse --short $(git hash-object uniq2))
	cat >expect <<EOF
diff --git a/uniq1 b/uniq2
index $uniq1..$uniq2 100644
--- a/uniq1
+++ b/uniq2
@@ -1,6 +1,6 @@
-1
-2
-3
-4
-5
-6
+a
+b
+c
+d
+e
+f
EOF

	STRATEGY=$1

	test_expect_success 'completely different files' '
		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
		test_cmp expect output
	'
}