blob: 5eb4cef0359212eeddc68578697ca432760e0be3 (
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
|
#!/bin/sh
test_description='last-modified tests'
. ./test-lib.sh
test_expect_success 'setup' '
test_commit 1 file &&
mkdir a &&
test_commit 2 a/file &&
mkdir a/b &&
test_commit 3 a/b/file
'
test_expect_success 'cannot run last-modified on two trees' '
test_must_fail git last-modified HEAD HEAD~1
'
check_last_modified() {
local indir= &&
while test $# != 0
do
case "$1" in
-C)
indir="$2"
shift
;;
*)
break
;;
esac &&
shift
done &&
cat >expect &&
test_when_finished "rm -f tmp.*" &&
git ${indir:+-C "$indir"} last-modified "$@" >tmp.1 &&
git name-rev --annotate-stdin --name-only --tags \
<tmp.1 >tmp.2 &&
tr '\t' ' ' <tmp.2 >actual &&
test_cmp expect actual
}
test_expect_success 'last-modified non-recursive' '
check_last_modified <<-\EOF
3 a
1 file
EOF
'
test_expect_success 'last-modified recursive' '
check_last_modified -r <<-\EOF
3 a/b/file
2 a/file
1 file
EOF
'
test_expect_success 'last-modified recursive with show-trees' '
check_last_modified -r -t <<-\EOF
3 a
3 a/b
3 a/b/file
2 a/file
1 file
EOF
'
test_expect_success 'last-modified non-recursive with show-trees' '
check_last_modified -t <<-\EOF
3 a
1 file
EOF
'
test_expect_success 'last-modified subdir' '
check_last_modified a <<-\EOF
3 a
EOF
'
test_expect_success 'last-modified subdir recursive' '
check_last_modified -r a <<-\EOF
3 a/b/file
2 a/file
EOF
'
test_expect_success 'last-modified from non-HEAD commit' '
check_last_modified HEAD^ <<-\EOF
2 a
1 file
EOF
'
test_expect_success 'last-modified from subdir defaults to root' '
check_last_modified -C a <<-\EOF
3 a
1 file
EOF
'
test_expect_success 'last-modified from subdir uses relative pathspecs' '
check_last_modified -C a -r b <<-\EOF
3 a/b/file
EOF
'
test_expect_success 'limit last-modified traversal by count' '
check_last_modified -1 <<-\EOF
3 a
^2 file
EOF
'
test_expect_success 'limit last-modified traversal by commit' '
check_last_modified HEAD~2..HEAD <<-\EOF
3 a
^1 file
EOF
'
test_expect_success 'only last-modified files in the current tree' '
git rm -rf a &&
git commit -m "remove a" &&
check_last_modified <<-\EOF
1 file
EOF
'
test_expect_success 'cross merge boundaries in blaming' '
git checkout HEAD^0 &&
git rm -rf . &&
test_commit m1 &&
git checkout HEAD^ &&
git rm -rf . &&
test_commit m2 &&
git merge m1 &&
check_last_modified <<-\EOF
m2 m2.t
m1 m1.t
EOF
'
test_expect_success 'last-modified merge for resolved conflicts' '
git checkout HEAD^0 &&
git rm -rf . &&
test_commit c1 conflict &&
git checkout HEAD^ &&
git rm -rf . &&
test_commit c2 conflict &&
test_must_fail git merge c1 &&
test_commit resolved conflict &&
check_last_modified conflict <<-\EOF
resolved conflict
EOF
'
# Consider `file` with this content through history:
#
# A---B---B-------B---B
# \ /
# C---D
test_expect_success 'last-modified merge ignores content from branch' '
git checkout HEAD^0 &&
git rm -rf . &&
test_commit a1 file A &&
test_commit a2 file B &&
test_commit a3 file C &&
test_commit a4 file D &&
git checkout a2 &&
git merge --no-commit --no-ff a4 &&
git checkout a2 -- file &&
git merge --continue &&
check_last_modified <<-\EOF
a2 file
EOF
'
# Consider `file` with this content through history:
#
# A---B---B---C---D---B---B
# \ /
# B-------B
test_expect_success 'last-modified merge undoes changes' '
git checkout HEAD^0 &&
git rm -rf . &&
test_commit b1 file A &&
test_commit b2 file B &&
test_commit b3 file C &&
test_commit b4 file D &&
git checkout b2 &&
test_commit b5 file2 2 &&
git checkout b4 &&
git merge --no-commit --no-ff b5 &&
git checkout b2 -- file &&
git merge --continue &&
check_last_modified <<-\EOF
b5 file2
b2 file
EOF
'
test_expect_success 'last-modified complains about unknown arguments' '
test_must_fail git last-modified --foo 2>err &&
grep "unknown last-modified argument: --foo" err
'
test_done
|
