blob: aec1d9d1b42f65f1080f7e054bca70bbffcefcc6 (
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
|
#!/bin/sh
test_description='diff order & rotate'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
create_files () {
echo "$1" >a.h &&
echo "$1" >b.c &&
echo "$1" >c/Makefile &&
echo "$1" >d.txt &&
git add a.h b.c c/Makefile d.txt &&
git commit -m"$1"
}
test_expect_success 'setup' '
mkdir c &&
create_files 1 &&
create_files 2 &&
cat >order_file_1 <<-\EOF &&
*Makefile
*.txt
*.h
EOF
cat >order_file_2 <<-\EOF &&
*Makefile
*.h
*.c
EOF
cat >expect_none <<-\EOF &&
a.h
b.c
c/Makefile
d.txt
EOF
cat >expect_1 <<-\EOF &&
c/Makefile
d.txt
a.h
b.c
EOF
cat >expect_2 <<-\EOF
c/Makefile
a.h
b.c
d.txt
EOF
'
test_expect_success "no order (=tree object order)" '
git diff --name-only HEAD^..HEAD >actual &&
test_cmp expect_none actual
'
test_expect_success 'missing orderfile' '
rm -f bogus_file &&
test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
'
test_expect_success POSIXPERM,SANITY 'unreadable orderfile' '
>unreadable_file &&
chmod -r unreadable_file &&
test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
'
test_expect_success "orderfile using option from subdir with --output" '
mkdir subdir &&
git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
test_cmp expect_1 actual
'
for i in 1 2
do
test_expect_success "orderfile using option ($i)" '
git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
test_cmp expect_$i actual
'
test_expect_success PIPE "orderfile is fifo ($i)" '
rm -f order_fifo &&
mkfifo order_fifo &&
{
cat order_file_$i >order_fifo &
} &&
git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
wait &&
test_cmp expect_$i actual
'
test_expect_success "orderfile using config ($i)" '
git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
test_cmp expect_$i actual
'
test_expect_success "cancelling configured orderfile ($i)" '
git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
test_cmp expect_none actual
'
done
test_expect_success 'setup for testing combine-diff order' '
git checkout -b tmp HEAD~ &&
create_files 3 &&
git checkout main &&
git merge --no-commit -s ours tmp &&
create_files 5
'
test_expect_success "combine-diff: no order (=tree object order)" '
git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
test_cmp expect_none actual
'
for i in 1 2
do
test_expect_success "combine-diff: orderfile using option ($i)" '
git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
test_cmp expect_$i actual
'
done
### rotate and skip
test_expect_success 'rotate and skip setup' '
>sample1.t &&
>sample2.t &&
>sample3.t &&
>sample4.t &&
git add sample[1234].t &&
git commit -m "added" sample[1234].t &&
echo modified >>sample1.t &&
echo modified >>sample2.t &&
echo modified >>sample4.t &&
git commit -m "updated" sample[1234].t
'
test_expect_success 'diff --rotate-to' '
git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
test_write_lines sample2.t sample4.t sample1.t >expect &&
test_cmp expect actual
'
test_expect_success 'diff --skip-to' '
git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
test_write_lines sample2.t sample4.t >expect &&
test_cmp expect actual
'
test_expect_success 'diff --rotate/skip-to error condition' '
test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
test_must_fail git diff --skip-to=sample3.t HEAD^
'
test_expect_success 'log --rotate-to' '
git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
# just distill the commit header and paths
sed -n -e "s/^commit.*/commit/p" \
-e "/^:/s/^.* //p" raw >actual &&
cat >expect <<-\EOF &&
commit
sample4.t
sample1.t
sample2.t
commit
sample3.t
sample4.t
sample1.t
sample2.t
EOF
test_cmp expect actual
'
test_expect_success 'log --skip-to' '
git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
# just distill the commit header and paths
sed -n -e "s/^commit.*/commit/p" \
-e "/^:/s/^.* //p" raw >actual &&
cat >expect <<-\EOF &&
commit
sample4.t
commit
sample3.t
sample4.t
EOF
test_cmp expect actual
'
test_done
|
