3 # Copyright (c) 2006 Johannes E. Schindelin
6 test_description='git rerere
12 ! [second] prefer first over second
19 - [second] prefer first over second
22 ++++++ [master] initial
27 test_expect_success 'setup' '
31 Whether '\''tis nobler in the mind to suffer
32 The slings and arrows of outrageous fortune,
33 Or to take arms against a sea of troubles,
34 And by opposing end them? To die: to sleep;
35 No more; and by a sleep to say we end
36 The heart-ache and the thousand natural shocks
37 That flesh is heir to, '\''tis a consummation
38 Devoutly to be wish'\''d.
43 git commit -q -a -m initial &&
49 To sleep: perchance to dream: ay, there'\''s the rub;
50 For in that sleep of death what dreams may come
51 When we have shuffled off this mortal coil,
52 Must give us pause: there'\''s the respect
53 That makes calamity of so long life;
56 git checkout -b first &&
58 git commit -q -a -m first &&
60 git checkout -b second master &&
62 sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
63 echo "* END *" >>a1 &&
65 git commit -q -a -m second
68 test_expect_success 'nothing recorded without rerere' '
69 rm -rf .git/rr-cache &&
70 git config rerere.enabled false &&
71 test_must_fail git merge first &&
72 ! test -d .git/rr-cache
75 test_expect_success 'activate rerere, old style (conflicting merge)' '
77 mkdir .git/rr-cache &&
78 test_might_fail git config --unset rerere.enabled &&
79 test_must_fail git merge first &&
81 sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
82 rr=.git/rr-cache/$sha1 &&
83 grep "^=======\$" $rr/preimage &&
84 ! test -f $rr/postimage &&
85 ! test -f $rr/thisimage
88 test_expect_success 'rerere.enabled works, too' '
89 rm -rf .git/rr-cache &&
90 git config rerere.enabled true &&
92 test_must_fail git merge first &&
94 sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
95 rr=.git/rr-cache/$sha1 &&
96 grep ^=======$ $rr/preimage
99 test_expect_success 'set up rr-cache' '
100 rm -rf .git/rr-cache &&
101 git config rerere.enabled true &&
103 test_must_fail git merge first &&
104 sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
105 rr=.git/rr-cache/$sha1
108 test_expect_success 'rr-cache looks sane' '
109 # no postimage or thisimage yet
110 ! test -f $rr/postimage &&
111 ! test -f $rr/thisimage &&
113 # preimage has right number of lines
114 cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
119 test_expect_success 'rerere diff' '
120 git show first:a1 >a1 &&
121 cat >expect <<-\EOF &&
128 Whether '\''tis nobler in the mind to suffer
129 The slings and arrows of outrageous fortune,
131 The heart-ache and the thousand natural shocks
132 That flesh is heir to, '\''tis a consummation
133 Devoutly to be wish'\''d.
143 To sleep: perchance to dream: ay, there'\''s the rub;
144 For in that sleep of death what dreams may come
145 When we have shuffled off this mortal coil,
146 Must give us pause: there'\''s the respect
147 That makes calamity of so long life;
153 git rerere diff >out &&
157 test_expect_success 'rerere status' '
159 git rerere status >out &&
163 test_expect_success 'first postimage wins' '
164 git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
166 git commit -q -a -m "prefer first over second" &&
167 test -f $rr/postimage &&
169 git checkout -b third master &&
170 git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
171 git commit -q -a -m third &&
173 test_must_fail git pull . first &&
175 ! grep "^=======\$" a1 &&
179 test_expect_success 'rerere clear' '
181 echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
186 test_expect_success 'set up for garbage collection tests' '
188 echo Hello >$rr/preimage &&
189 echo World >$rr/postimage &&
191 sha2=4000000000000000000000000000000000000000 &&
192 rr2=.git/rr-cache/$sha2 &&
194 echo Hello >$rr2/preimage &&
196 almost_15_days_ago=$((60-15*86400)) &&
197 just_over_15_days_ago=$((-1-15*86400)) &&
198 almost_60_days_ago=$((60-60*86400)) &&
199 just_over_60_days_ago=$((-1-60*86400)) &&
201 test-chmtime =$almost_60_days_ago $rr/preimage &&
202 test-chmtime =$almost_15_days_ago $rr2/preimage
205 test_expect_success 'garbage collection preserves young records' '
207 test -f $rr/preimage &&
208 test -f $rr2/preimage
211 test_expect_success 'old records rest in peace' '
212 test-chmtime =$just_over_60_days_ago $rr/preimage &&
213 test-chmtime =$just_over_15_days_ago $rr2/preimage &&
215 ! test -f $rr/preimage &&
216 ! test -f $rr2/preimage
219 test_expect_success 'setup: file2 added differently in two branches' '
222 git checkout -b fourth &&
226 git commit -m version1 &&
228 git checkout third &&
232 git commit -m version2 &&
234 test_must_fail git merge fourth &&
237 git commit -m resolution
240 test_expect_success 'resolution was recorded properly' '
241 echo Cello >expected &&
243 git reset --hard HEAD~2 &&
244 git checkout -b fifth &&
249 git commit -m version1 &&
251 git checkout third &&
255 git commit -m version2 &&
258 test_must_fail git merge fifth &&
259 test_cmp expected file3 &&
260 test_must_fail git update-index --refresh
263 test_expect_success 'rerere.autoupdate' '
264 git config rerere.autoupdate true &&
266 git checkout version2 &&
267 test_must_fail git merge fifth &&
268 git update-index --refresh
271 test_expect_success 'merge --rerere-autoupdate' '
272 test_might_fail git config --unset rerere.autoupdate &&
274 git checkout version2 &&
275 test_must_fail git merge --rerere-autoupdate fifth &&
276 git update-index --refresh
279 test_expect_success 'merge --no-rerere-autoupdate' '
280 headblob=$(git rev-parse version2:file3) &&
281 mergeblob=$(git rev-parse fifth:file3) &&
282 cat >expected <<-EOF &&
283 100644 $headblob 2 file3
284 100644 $mergeblob 3 file3
287 git config rerere.autoupdate true &&
289 git checkout version2 &&
290 test_must_fail git merge --no-rerere-autoupdate fifth &&
291 git ls-files -u >actual &&
292 test_cmp expected actual