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 oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
171 git checkout -b third master &&
172 git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
173 git commit -q -a -m third &&
175 test_must_fail git merge first &&
177 ! grep "^=======\$" a1 &&
181 test_expect_success
'rerere updates postimage timestamp' '
182 newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
183 test $oldmtimepost -lt $newmtimepost
186 test_expect_success
'rerere clear' '
187 mv $rr/postimage .git/post-saved &&
188 echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
193 test_expect_success
'leftover directory' '
196 test_must_fail git merge first &&
200 test_expect_success
'missing preimage' '
203 cp .git/post-saved $rr/postimage &&
204 test_must_fail git merge first &&
208 test_expect_success
'set up for garbage collection tests' '
210 echo Hello >$rr/preimage &&
211 echo World >$rr/postimage &&
213 sha2=4000000000000000000000000000000000000000 &&
214 rr2=.git/rr-cache/$sha2 &&
216 echo Hello >$rr2/preimage &&
218 almost_15_days_ago=$((60-15*86400)) &&
219 just_over_15_days_ago=$((-1-15*86400)) &&
220 almost_60_days_ago=$((60-60*86400)) &&
221 just_over_60_days_ago=$((-1-60*86400)) &&
223 test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
224 test-tool chmtime =$almost_60_days_ago $rr/postimage &&
225 test-tool chmtime =$almost_15_days_ago $rr2/preimage
228 test_expect_success
'gc preserves young or recently used records' '
230 test -f $rr/preimage &&
231 test -f $rr2/preimage
234 test_expect_success
'old records rest in peace' '
235 test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
236 test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
238 ! test -f $rr/preimage &&
239 ! test -f $rr2/preimage
242 rerere_gc_custom_expiry_test
() {
243 five_days
="$1" right_now
="$2"
244 test_expect_success
"rerere gc with custom expiry ($five_days, $right_now)" '
245 rm -fr .git/rr-cache &&
246 rr=.git/rr-cache/$ZERO_OID &&
251 two_days_ago=$((-2*86400)) &&
252 test-tool chmtime =$two_days_ago "$rr/preimage" &&
253 test-tool chmtime =$two_days_ago "$rr/postimage" &&
255 find .git/rr-cache -type f | sort >original &&
257 git -c "gc.rerereresolved=$five_days" \
258 -c "gc.rerereunresolved=$five_days" rerere gc &&
259 find .git/rr-cache -type f | sort >actual &&
260 test_cmp original actual &&
262 git -c "gc.rerereresolved=$five_days" \
263 -c "gc.rerereunresolved=$right_now" rerere gc &&
264 find .git/rr-cache -type f | sort >actual &&
265 test_cmp original actual &&
267 git -c "gc.rerereresolved=$right_now" \
268 -c "gc.rerereunresolved=$right_now" rerere gc &&
269 find .git/rr-cache -type f | sort >actual &&
270 test_must_be_empty actual
274 rerere_gc_custom_expiry_test
5 0
276 rerere_gc_custom_expiry_test
5.days.ago now
278 test_expect_success
'setup: file2 added differently in two branches' '
281 git checkout -b fourth &&
285 git commit -m version1 &&
287 git checkout third &&
291 git commit -m version2 &&
293 test_must_fail git merge fourth &&
296 git commit -m resolution
299 test_expect_success
'resolution was recorded properly' '
300 echo Cello >expected &&
302 git reset --hard HEAD~2 &&
303 git checkout -b fifth &&
308 git commit -m version1 &&
310 git checkout third &&
314 git commit -m version2 &&
317 test_must_fail git merge fifth &&
318 test_cmp expected file3 &&
319 test_must_fail git update-index --refresh
322 test_expect_success
'rerere.autoupdate' '
323 git config rerere.autoupdate true &&
325 git checkout version2 &&
326 test_must_fail git merge fifth &&
327 git update-index --refresh
330 test_expect_success
'merge --rerere-autoupdate' '
331 test_might_fail git config --unset rerere.autoupdate &&
333 git checkout version2 &&
334 test_must_fail git merge --rerere-autoupdate fifth &&
335 git update-index --refresh
338 test_expect_success
'merge --no-rerere-autoupdate' '
339 headblob=$(git rev-parse version2:file3) &&
340 mergeblob=$(git rev-parse fifth:file3) &&
341 cat >expected <<-EOF &&
342 100644 $headblob 2 file3
343 100644 $mergeblob 3 file3
346 git config rerere.autoupdate true &&
348 git checkout version2 &&
349 test_must_fail git merge --no-rerere-autoupdate fifth &&
350 git ls-files -u >actual &&
351 test_cmp expected actual
354 test_expect_success
'set up an unresolved merge' '
355 headblob=$(git rev-parse version2:file3) &&
356 mergeblob=$(git rev-parse fifth:file3) &&
357 cat >expected.unresolved <<-EOF &&
358 100644 $headblob 2 file3
359 100644 $mergeblob 3 file3
362 test_might_fail git config --unset rerere.autoupdate &&
364 git checkout version2 &&
365 fifth=$(git rev-parse fifth) &&
366 echo "$fifth branch 'fifth
' of ." |
367 git fmt-merge-msg >msg &&
368 ancestor=$(git merge-base version2 fifth) &&
369 test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
371 git ls-files --stage >failedmerge &&
372 cp file3 file3.conflict &&
374 git ls-files -u >actual &&
375 test_cmp expected.unresolved actual
378 test_expect_success
'explicit rerere' '
379 test_might_fail git config --unset rerere.autoupdate &&
380 git rm -fr --cached . &&
381 git update-index --index-info <failedmerge &&
382 cp file3.conflict file3 &&
383 test_must_fail git update-index --refresh -q &&
386 git ls-files -u >actual &&
387 test_cmp expected.unresolved actual
390 test_expect_success
'explicit rerere with autoupdate' '
391 git config rerere.autoupdate true &&
392 git rm -fr --cached . &&
393 git update-index --index-info <failedmerge &&
394 cp file3.conflict file3 &&
395 test_must_fail git update-index --refresh -q &&
398 git update-index --refresh
401 test_expect_success
'explicit rerere --rerere-autoupdate overrides' '
402 git config rerere.autoupdate false &&
403 git rm -fr --cached . &&
404 git update-index --index-info <failedmerge &&
405 cp file3.conflict file3 &&
407 git ls-files -u >actual1 &&
409 git rm -fr --cached . &&
410 git update-index --index-info <failedmerge &&
411 cp file3.conflict file3 &&
412 git rerere --rerere-autoupdate &&
413 git update-index --refresh &&
415 git rm -fr --cached . &&
416 git update-index --index-info <failedmerge &&
417 cp file3.conflict file3 &&
418 git rerere --rerere-autoupdate --no-rerere-autoupdate &&
419 git ls-files -u >actual2 &&
421 git rm -fr --cached . &&
422 git update-index --index-info <failedmerge &&
423 cp file3.conflict file3 &&
424 git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
425 git update-index --refresh &&
427 test_cmp expected.unresolved actual1 &&
428 test_cmp expected.unresolved actual2
431 test_expect_success
'rerere --no-no-rerere-autoupdate' '
432 git rm -fr --cached . &&
433 git update-index --index-info <failedmerge &&
434 cp file3.conflict file3 &&
435 test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
436 test_i18ngrep [Uu]sage err &&
437 test_must_fail git update-index --refresh
440 test_expect_success
'rerere -h' '
441 test_must_fail git rerere -h >help &&
442 test_i18ngrep [Uu]sage help
448 cat early
&& printf "%s\n" "$@" && cat late
"$last"
452 find .git
/rr-cache
/ -type f
-name "preimage*" >actual
&&
453 test_line_count
= "$1" actual
&&
454 find .git
/rr-cache
/ -type f
-name "postimage*" >actual
&&
455 test_line_count
= "$2" actual
458 merge_conflict_resolve
() {
460 test_must_fail git merge six
.1 &&
461 # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
462 concat_insert short
6.1 6.2 >file1
&&
463 concat_insert long
6.1 6.2 >file2
466 test_expect_success
'multiple identical conflicts' '
467 rm -fr .git/rr-cache &&
468 mkdir .git/rr-cache &&
471 test_seq 1 6 >early &&
473 test_seq 11 15 >short &&
474 test_seq 111 120 >long &&
475 concat_insert short >file1 &&
476 concat_insert long >file2 &&
477 git add file1 file2 &&
478 git commit -m base &&
480 git checkout -b six.1 &&
481 concat_insert short 6.1 >file1 &&
482 concat_insert long 6.1 >file2 &&
483 git add file1 file2 &&
485 git checkout -b six.2 HEAD^ &&
486 concat_insert short 6.2 >file1 &&
487 concat_insert long 6.2 >file2 &&
488 git add file1 file2 &&
491 # At this point, six.1 and six.2
492 # - derive from common ancestor that has two files
493 # 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
494 # - six.1 replaces these 7s with 6.1
495 # - six.2 replaces these 7s with 6.2
497 merge_conflict_resolve &&
499 # Check that rerere knows that file1 and file2 have conflicts
501 printf "%s\n" file1 file2 >expect &&
502 git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
503 test_cmp expect actual &&
505 git rerere status | sort >actual &&
506 test_cmp expect actual &&
508 git rerere remaining >actual &&
509 test_cmp expect actual &&
511 count_pre_post 2 0 &&
513 # Pretend that the conflicts were made quite some time ago
514 test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
516 # Unresolved entries have not expired yet
517 git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
518 count_pre_post 2 0 &&
520 # Unresolved entries have expired
521 git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
522 count_pre_post 0 0 &&
524 # Recreate the conflicted state
525 merge_conflict_resolve &&
526 count_pre_post 2 0 &&
530 count_pre_post 0 0 &&
532 # Recreate the conflicted state
533 merge_conflict_resolve &&
534 count_pre_post 2 0 &&
536 # We resolved file1 and file2
538 git rerere remaining >actual &&
539 test_must_be_empty actual &&
541 # We must have recorded both of them
542 count_pre_post 2 2 &&
544 # Now we should be able to resolve them both
546 test_must_fail git merge six.1 &&
549 git rerere remaining >actual &&
550 test_must_be_empty actual &&
552 concat_insert short 6.1 6.2 >file1.expect &&
553 concat_insert long 6.1 6.2 >file2.expect &&
554 test_cmp file1.expect file1 &&
555 test_cmp file2.expect file2 &&
557 # Forget resolution for file2
558 git rerere forget file2 &&
559 echo file2 >expect &&
560 git rerere status >actual &&
561 test_cmp expect actual &&
562 count_pre_post 2 1 &&
564 # file2 already has correct resolution, so record it again
567 # Pretend that the resolutions are old again
568 test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
570 # Resolved entries have not expired yet
571 git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
573 count_pre_post 2 2 &&
575 # Resolved entries have expired
576 git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
580 test_expect_success
'rerere with unexpected conflict markers does not crash' '
583 git checkout -b branch-1 master &&
586 git commit -q -m two &&
589 git checkout -b branch-2 master &&
592 git commit -q -a -m one &&
594 test_must_fail git merge branch-1 &&
595 echo "<<<<<<< a" >test &&
601 test_expect_success
'rerere with inner conflict markers' '
604 git checkout -b A master &&
607 git commit -q -m two &&
610 git commit -q -m three &&
613 git checkout -b B master &&
616 git commit -q -a -m one &&
618 test_must_fail git merge A~ &&
620 git commit -q -m "will solve conflicts later" &&
621 test_must_fail git merge A &&
623 echo "resolved" >test &&
625 git commit -q -m "solved conflict" &&
627 echo "resolved" >expect &&
629 git reset --hard HEAD~~ &&
630 test_must_fail git merge A~ &&
632 git commit -q -m "will solve conflicts later" &&
633 test_must_fail git merge A &&
635 test_cmp expect actual &&
638 git commit -m "rerere solved conflict" &&
639 git reset --hard HEAD~ &&
640 test_must_fail git merge A &&
642 test_cmp expect actual
645 test_expect_success
'setup simple stage 1 handling' '
646 test_create_repo stage_1_handling &&
648 cd stage_1_handling &&
650 test_seq 1 10 >original &&
652 git commit -m original &&
654 git checkout -b A master &&
656 git commit -m "rename to A" &&
658 git checkout -b B master &&
660 git commit -m "rename to B"
664 test_expect_success
'test simple stage 1 handling' '
666 cd stage_1_handling &&
668 git config rerere.enabled true &&
670 test_must_fail git merge B^0