[thirdparty/git.git] / t / t4200-rerere.sh

#!/bin/sh
#
# Copyright (c) 2006 Johannes E. Schindelin
#

test_description='git rerere

! [fifth] version1
 ! [first] first
  ! [fourth] version1
   ! [master] initial
    ! [second] prefer first over second
     ! [third] version2
------
     + [third] version2
+      [fifth] version1
  +    [fourth] version1
+ +  + [third^] third
    -  [second] prefer first over second
 +  +  [first] first
    +  [second^] second
++++++ [master] initial
'

. ./test-lib.sh

test_expect_success 'setup' '
	cat >a1 <<-\EOF &&
	Some title
	==========
	Whether '\''tis nobler in the mind to suffer
	The slings and arrows of outrageous fortune,
	Or to take arms against a sea of troubles,
	And by opposing end them? To die: to sleep;
	No more; and by a sleep to say we end
	The heart-ache and the thousand natural shocks
	That flesh is heir to, '\''tis a consummation
	Devoutly to be wish'\''d.
	EOF

	git add a1 &&
	test_tick &&
	git commit -q -a -m initial &&

	cat >>a1 <<-\EOF &&
	Some title
	==========
	To die, to sleep;
	To sleep: perchance to dream: ay, there'\''s the rub;
	For in that sleep of death what dreams may come
	When we have shuffled off this mortal coil,
	Must give us pause: there'\''s the respect
	That makes calamity of so long life;
	EOF

	git checkout -b first &&
	test_tick &&
	git commit -q -a -m first &&

	git checkout -b second master &&
	git show first:a1 |
	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
	echo "* END *" >>a1 &&
	test_tick &&
	git commit -q -a -m second
'

test_expect_success 'nothing recorded without rerere' '
	rm -rf .git/rr-cache &&
	git config rerere.enabled false &&
	test_must_fail git merge first &&
	! test -d .git/rr-cache
'

test_expect_success 'activate rerere, old style (conflicting merge)' '
	git reset --hard &&
	mkdir .git/rr-cache &&
	test_might_fail git config --unset rerere.enabled &&
	test_must_fail git merge first &&

	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
	rr=.git/rr-cache/$sha1 &&
	grep "^=======\$" $rr/preimage &&
	! test -f $rr/postimage &&
	! test -f $rr/thisimage
'

test_expect_success 'rerere.enabled works, too' '
	rm -rf .git/rr-cache &&
	git config rerere.enabled true &&
	git reset --hard &&
	test_must_fail git merge first &&

	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
	rr=.git/rr-cache/$sha1 &&
	grep ^=======$ $rr/preimage
'

test_expect_success 'set up rr-cache' '
	rm -rf .git/rr-cache &&
	git config rerere.enabled true &&
	git reset --hard &&
	test_must_fail git merge first &&
	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
	rr=.git/rr-cache/$sha1
'

test_expect_success 'rr-cache looks sane' '
	# no postimage or thisimage yet
	! test -f $rr/postimage &&
	! test -f $rr/thisimage &&

	# preimage has right number of lines
	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
	echo $cnt &&
	test $cnt = 13
'

test_expect_success 'rerere diff' '
	git show first:a1 >a1 &&
	cat >expect <<-\EOF &&
	--- a/a1
	+++ b/a1
	@@ -1,4 +1,4 @@
	-Some Title
	+Some title
	 ==========
	 Whether '\''tis nobler in the mind to suffer
	 The slings and arrows of outrageous fortune,
	@@ -8,21 +8,11 @@
	 The heart-ache and the thousand natural shocks
	 That flesh is heir to, '\''tis a consummation
	 Devoutly to be wish'\''d.
	-<<<<<<<
	-Some Title
	-==========
	-To die! To sleep;
	-=======
	 Some title
	 ==========
	 To die, to sleep;
	->>>>>>>
	 To sleep: perchance to dream: ay, there'\''s the rub;
	 For in that sleep of death what dreams may come
	 When we have shuffled off this mortal coil,
	 Must give us pause: there'\''s the respect
	 That makes calamity of so long life;
	-<<<<<<<
	-=======
	-* END *
	->>>>>>>
	EOF
	git rerere diff >out &&
	test_cmp expect out
'

test_expect_success 'rerere status' '
	echo a1 >expect &&
	git rerere status >out &&
	test_cmp expect out
'

test_expect_success 'first postimage wins' '
	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&

	git commit -q -a -m "prefer first over second" &&
	test -f $rr/postimage &&

	oldmtimepost=$(test-tool chmtime -v -60 $rr/postimage | cut -f 1) &&

	git checkout -b third master &&
	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
	git commit -q -a -m third &&

	test_must_fail git merge first &&
	# rerere kicked in
	! grep "^=======\$" a1 &&
	test_cmp expect a1
'

test_expect_success 'rerere updates postimage timestamp' '
	newmtimepost=$(test-tool chmtime -v +0 $rr/postimage | cut -f 1) &&
	test $oldmtimepost -lt $newmtimepost
'

test_expect_success 'rerere clear' '
	mv $rr/postimage .git/post-saved &&
	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
	git rerere clear &&
	! test -d $rr
'

test_expect_success 'leftover directory' '
	git reset --hard &&
	mkdir -p $rr &&
	test_must_fail git merge first &&
	test -f $rr/preimage
'

test_expect_success 'missing preimage' '
	git reset --hard &&
	mkdir -p $rr &&
	cp .git/post-saved $rr/postimage &&
	test_must_fail git merge first &&
	test -f $rr/preimage
'

test_expect_success 'set up for garbage collection tests' '
	mkdir -p $rr &&
	echo Hello >$rr/preimage &&
	echo World >$rr/postimage &&

	sha2=4000000000000000000000000000000000000000 &&
	rr2=.git/rr-cache/$sha2 &&
	mkdir $rr2 &&
	echo Hello >$rr2/preimage &&

	almost_15_days_ago=$((60-15*86400)) &&
	just_over_15_days_ago=$((-1-15*86400)) &&
	almost_60_days_ago=$((60-60*86400)) &&
	just_over_60_days_ago=$((-1-60*86400)) &&

	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
	test-tool chmtime =$almost_15_days_ago $rr2/preimage
'

test_expect_success 'gc preserves young or recently used records' '
	git rerere gc &&
	test -f $rr/preimage &&
	test -f $rr2/preimage
'

test_expect_success 'old records rest in peace' '
	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
	git rerere gc &&
	! test -f $rr/preimage &&
	! test -f $rr2/preimage
'

rerere_gc_custom_expiry_test () {
	five_days="$1" right_now="$2"
	test_expect_success "rerere gc with custom expiry ($five_days, $right_now)" '
		rm -fr .git/rr-cache &&
		rr=.git/rr-cache/$_z40 &&
		mkdir -p "$rr" &&
		>"$rr/preimage" &&
		>"$rr/postimage" &&

		two_days_ago=$((-2*86400)) &&
		test-tool chmtime =$two_days_ago "$rr/preimage" &&
		test-tool chmtime =$two_days_ago "$rr/postimage" &&

		find .git/rr-cache -type f | sort >original &&

		git -c "gc.rerereresolved=$five_days" \
		    -c "gc.rerereunresolved=$five_days" rerere gc &&
		find .git/rr-cache -type f | sort >actual &&
		test_cmp original actual &&

		git -c "gc.rerereresolved=$five_days" \
		    -c "gc.rerereunresolved=$right_now" rerere gc &&
		find .git/rr-cache -type f | sort >actual &&
		test_cmp original actual &&

		git -c "gc.rerereresolved=$right_now" \
		    -c "gc.rerereunresolved=$right_now" rerere gc &&
		find .git/rr-cache -type f | sort >actual &&
		>expect &&
		test_cmp expect actual
	'
}

rerere_gc_custom_expiry_test 5 0

rerere_gc_custom_expiry_test 5.days.ago now

test_expect_success 'setup: file2 added differently in two branches' '
	git reset --hard &&

	git checkout -b fourth &&
	echo Hallo >file2 &&
	git add file2 &&
	test_tick &&
	git commit -m version1 &&

	git checkout third &&
	echo Bello >file2 &&
	git add file2 &&
	test_tick &&
	git commit -m version2 &&

	test_must_fail git merge fourth &&
	echo Cello >file2 &&
	git add file2 &&
	git commit -m resolution
'

test_expect_success 'resolution was recorded properly' '
	echo Cello >expected &&

	git reset --hard HEAD~2 &&
	git checkout -b fifth &&

	echo Hallo >file3 &&
	git add file3 &&
	test_tick &&
	git commit -m version1 &&

	git checkout third &&
	echo Bello >file3 &&
	git add file3 &&
	test_tick &&
	git commit -m version2 &&
	git tag version2 &&

	test_must_fail git merge fifth &&
	test_cmp expected file3 &&
	test_must_fail git update-index --refresh
'

test_expect_success 'rerere.autoupdate' '
	git config rerere.autoupdate true &&
	git reset --hard &&
	git checkout version2 &&
	test_must_fail git merge fifth &&
	git update-index --refresh
'

test_expect_success 'merge --rerere-autoupdate' '
	test_might_fail git config --unset rerere.autoupdate &&
	git reset --hard &&
	git checkout version2 &&
	test_must_fail git merge --rerere-autoupdate fifth &&
	git update-index --refresh
'

test_expect_success 'merge --no-rerere-autoupdate' '
	headblob=$(git rev-parse version2:file3) &&
	mergeblob=$(git rev-parse fifth:file3) &&
	cat >expected <<-EOF &&
	100644 $headblob 2	file3
	100644 $mergeblob 3	file3
	EOF

	git config rerere.autoupdate true &&
	git reset --hard &&
	git checkout version2 &&
	test_must_fail git merge --no-rerere-autoupdate fifth &&
	git ls-files -u >actual &&
	test_cmp expected actual
'

test_expect_success 'set up an unresolved merge' '
	headblob=$(git rev-parse version2:file3) &&
	mergeblob=$(git rev-parse fifth:file3) &&
	cat >expected.unresolved <<-EOF &&
	100644 $headblob 2	file3
	100644 $mergeblob 3	file3
	EOF

	test_might_fail git config --unset rerere.autoupdate &&
	git reset --hard &&
	git checkout version2 &&
	fifth=$(git rev-parse fifth) &&
	echo "$fifth		branch 'fifth' of ." |
	git fmt-merge-msg >msg &&
	ancestor=$(git merge-base version2 fifth) &&
	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&

	git ls-files --stage >failedmerge &&
	cp file3 file3.conflict &&

	git ls-files -u >actual &&
	test_cmp expected.unresolved actual
'

test_expect_success 'explicit rerere' '
	test_might_fail git config --unset rerere.autoupdate &&
	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	test_must_fail git update-index --refresh -q &&

	git rerere &&
	git ls-files -u >actual &&
	test_cmp expected.unresolved actual
'

test_expect_success 'explicit rerere with autoupdate' '
	git config rerere.autoupdate true &&
	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	test_must_fail git update-index --refresh -q &&

	git rerere &&
	git update-index --refresh
'

test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
	git config rerere.autoupdate false &&
	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	git rerere &&
	git ls-files -u >actual1 &&

	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	git rerere --rerere-autoupdate &&
	git update-index --refresh &&

	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
	git ls-files -u >actual2 &&

	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
	git update-index --refresh &&

	test_cmp expected.unresolved actual1 &&
	test_cmp expected.unresolved actual2
'

test_expect_success 'rerere --no-no-rerere-autoupdate' '
	git rm -fr --cached . &&
	git update-index --index-info <failedmerge &&
	cp file3.conflict file3 &&
	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
	test_i18ngrep [Uu]sage err &&
	test_must_fail git update-index --refresh
'

test_expect_success 'rerere -h' '
	test_must_fail git rerere -h >help &&
	test_i18ngrep [Uu]sage help
'

concat_insert () {
	last=$1
	shift
	cat early && printf "%s\n" "$@" && cat late "$last"
}

count_pre_post () {
	find .git/rr-cache/ -type f -name "preimage*" >actual &&
	test_line_count = "$1" actual &&
	find .git/rr-cache/ -type f -name "postimage*" >actual &&
	test_line_count = "$2" actual
}

merge_conflict_resolve () {
	git reset --hard &&
	test_must_fail git merge six.1 &&
	# Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
	concat_insert short 6.1 6.2 >file1 &&
	concat_insert long 6.1 6.2 >file2
}

test_expect_success 'multiple identical conflicts' '
	rm -fr .git/rr-cache &&
	mkdir .git/rr-cache &&
	git reset --hard &&

	test_seq 1 6 >early &&
	>late &&
	test_seq 11 15 >short &&
	test_seq 111 120 >long &&
	concat_insert short >file1 &&
	concat_insert long >file2 &&
	git add file1 file2 &&
	git commit -m base &&
	git tag base &&
	git checkout -b six.1 &&
	concat_insert short 6.1 >file1 &&
	concat_insert long 6.1 >file2 &&
	git add file1 file2 &&
	git commit -m 6.1 &&
	git checkout -b six.2 HEAD^ &&
	concat_insert short 6.2 >file1 &&
	concat_insert long 6.2 >file2 &&
	git add file1 file2 &&
	git commit -m 6.2 &&

	# At this point, six.1 and six.2
	# - derive from common ancestor that has two files
	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
	# - six.1 replaces these 7s with 6.1
	# - six.2 replaces these 7s with 6.2

	merge_conflict_resolve &&

	# Check that rerere knows that file1 and file2 have conflicts

	printf "%s\n" file1 file2 >expect &&
	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
	test_cmp expect actual &&

	git rerere status | sort >actual &&
	test_cmp expect actual &&

	git rerere remaining >actual &&
	test_cmp expect actual &&

	count_pre_post 2 0 &&

	# Pretend that the conflicts were made quite some time ago
	find .git/rr-cache/ -type f | xargs test-tool chmtime -172800 &&

	# Unresolved entries have not expired yet
	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
	count_pre_post 2 0 &&

	# Unresolved entries have expired
	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
	count_pre_post 0 0 &&

	# Recreate the conflicted state
	merge_conflict_resolve &&
	count_pre_post 2 0 &&

	# Clear it
	git rerere clear &&
	count_pre_post 0 0 &&

	# Recreate the conflicted state
	merge_conflict_resolve &&
	count_pre_post 2 0 &&

	# We resolved file1 and file2
	git rerere &&
	>expect &&
	git rerere remaining >actual &&
	test_cmp expect actual &&

	# We must have recorded both of them
	count_pre_post 2 2 &&

	# Now we should be able to resolve them both
	git reset --hard &&
	test_must_fail git merge six.1 &&
	git rerere &&

	>expect &&
	git rerere remaining >actual &&
	test_cmp expect actual &&

	concat_insert short 6.1 6.2 >file1.expect &&
	concat_insert long 6.1 6.2 >file2.expect &&
	test_cmp file1.expect file1 &&
	test_cmp file2.expect file2 &&

	# Forget resolution for file2
	git rerere forget file2 &&
	echo file2 >expect &&
	git rerere status >actual &&
	test_cmp expect actual &&
	count_pre_post 2 1 &&

	# file2 already has correct resolution, so record it again
	git rerere &&

	# Pretend that the resolutions are old again
	find .git/rr-cache/ -type f | xargs test-tool chmtime -172800 &&

	# Resolved entries have not expired yet
	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&

	count_pre_post 2 2 &&

	# Resolved entries have expired
	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
	count_pre_post 0 0
'

test_done
Commit	Line	Data
ad8e72cb JS	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Johannes E. Schindelin
	4	#
	5
5be60078	6	test_description='git rerere
f7314882 JN	7
	8	! [fifth] version1
	9	! [first] first
	10	! [fourth] version1
	11	! [master] initial
	12	! [second] prefer first over second
	13	! [third] version2
	14	------
	15	+ [third] version2
	16	+ [fifth] version1
	17	+ [fourth] version1
	18	+ + + [third^] third
	19	- [second] prefer first over second
	20	+ + [first] first
	21	+ [second^] second
	22	++++++ [master] initial
ad8e72cb JS	23	'
	24
	25	. ./test-lib.sh
	26
f7314882 JN	27	test_expect_success 'setup' '
f7314882 JN	28	cat >a1 <<-\EOF &&
4a45f7dd BG	29	Some title
4a45f7dd BG	30	==========
f7314882	31	Whether '\''tis nobler in the mind to suffer
4a45f7dd BG	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
f7314882 JN	37	That flesh is heir to, '\''tis a consummation
f7314882 JN	38	Devoutly to be wish'\''d.
4a45f7dd	39	EOF
ad8e72cb	40
4a45f7dd	41	git add a1 &&
f7314882	42	test_tick &&
4a45f7dd	43	git commit -q -a -m initial &&
ad8e72cb	44
f7314882	45	cat >>a1 <<-\EOF &&
4a45f7dd BG	46	Some title
	47	==========
	48	To die, to sleep;
f7314882	49	To sleep: perchance to dream: ay, there'\''s the rub;
4a45f7dd BG	50	For in that sleep of death what dreams may come
4a45f7dd BG	51	When we have shuffled off this mortal coil,
f7314882	52	Must give us pause: there'\''s the respect
4a45f7dd BG	53	That makes calamity of so long life;
4a45f7dd BG	54	EOF
f7314882 JN	55
	56	git checkout -b first &&
	57	test_tick &&
4a45f7dd	58	git commit -q -a -m first &&
ad8e72cb	59
4a45f7dd BG	60	git checkout -b second master &&
4a45f7dd BG	61	git show first:a1 \|
f7314882 JN	62	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
	63	echo "* END *" >>a1 &&
	64	test_tick &&
4a45f7dd	65	git commit -q -a -m second
f7314882	66	'
ad8e72cb	67
b4372ef1	68	test_expect_success 'nothing recorded without rerere' '
f7314882 JN	69	rm -rf .git/rr-cache &&
f7314882 JN	70	git config rerere.enabled false &&
d492b31c	71	test_must_fail git merge first &&
b4372ef1 JS	72	! test -d .git/rr-cache
b4372ef1 JS	73	'
ad8e72cb	74
f7314882	75	test_expect_success 'activate rerere, old style (conflicting merge)' '
b4372ef1 JS	76	git reset --hard &&
b4372ef1 JS	77	mkdir .git/rr-cache &&
f7314882 JN	78	test_might_fail git config --unset rerere.enabled &&
f7314882 JN	79	test_must_fail git merge first &&
ad8e72cb	80
94221d22	81	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882 JN	82	rr=.git/rr-cache/$sha1 &&
	83	grep "^=======\$" $rr/preimage &&
	84	! test -f $rr/postimage &&
	85	! test -f $rr/thisimage
	86	'
ad8e72cb	87
b4372ef1 JS	88	test_expect_success 'rerere.enabled works, too' '
	89	rm -rf .git/rr-cache &&
	90	git config rerere.enabled true &&
	91	git reset --hard &&
d492b31c	92	test_must_fail git merge first &&
f7314882	93
94221d22	94	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882	95	rr=.git/rr-cache/$sha1 &&
99d698f1	96	grep ^=======$ $rr/preimage
b4372ef1 JS	97	'
b4372ef1 JS	98
f7314882 JN	99	test_expect_success 'set up rr-cache' '
	100	rm -rf .git/rr-cache &&
	101	git config rerere.enabled true &&
	102	git reset --hard &&
	103	test_must_fail git merge first &&
94221d22	104	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882 JN	105	rr=.git/rr-cache/$sha1
f7314882 JN	106	'
ad8e72cb	107
f7314882 JN	108	test_expect_success 'rr-cache looks sane' '
	109	# no postimage or thisimage yet
	110	! test -f $rr/postimage &&
	111	! test -f $rr/thisimage &&
eb335966	112
f7314882	113	# preimage has right number of lines
eb335966	114	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage \| wc -l) &&
f7314882	115	echo $cnt &&
99d698f1	116	test $cnt = 13
eb335966 JH	117	'
eb335966 JH	118
f7314882 JN	119	test_expect_success 'rerere diff' '
	120	git show first:a1 >a1 &&
	121	cat >expect <<-\EOF &&
	122	--- a/a1
	123	+++ b/a1
	124	@@ -1,4 +1,4 @@
	125	-Some Title
	126	+Some title
	127	==========
	128	Whether '\''tis nobler in the mind to suffer
	129	The slings and arrows of outrageous fortune,
	130	@@ -8,21 +8,11 @@
	131	The heart-ache and the thousand natural shocks
	132	That flesh is heir to, '\''tis a consummation
	133	Devoutly to be wish'\''d.
	134	-<<<<<<<
	135	-Some Title
	136	-==========
	137	-To die! To sleep;
	138	-=======
	139	Some title
	140	==========
	141	To die, to sleep;
	142	->>>>>>>
	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;
	148	-<<<<<<<
	149	-=======
	150	-* END *
	151	->>>>>>>
	152	EOF
	153	git rerere diff >out &&
	154	test_cmp expect out
52aaf649	155	'
ad8e72cb	156
f7314882 JN	157	test_expect_success 'rerere status' '
	158	echo a1 >expect &&
	159	git rerere status >out &&
	160	test_cmp expect out
7d7ff15b SG	161	'
7d7ff15b SG	162
f7314882 JN	163	test_expect_success 'first postimage wins' '
f7314882 JN	164	git show first:a1 \| sed "s/To die: t/To die! T/" >expect &&
ad8e72cb	165
f7314882 JN	166	git commit -q -a -m "prefer first over second" &&
f7314882 JN	167	test -f $rr/postimage &&
ad8e72cb	168
0e496492	169	oldmtimepost=$(test-tool chmtime -v -60 $rr/postimage \| cut -f 1) &&
ad8e72cb	170
f7314882 JN	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 &&
ad8e72cb	174
501a75a7	175	test_must_fail git merge first &&
f7314882 JN	176	# rerere kicked in
	177	! grep "^=======\$" a1 &&
	178	test_cmp expect a1
	179	'
ad8e72cb	180
8aed4a5e	181	test_expect_success 'rerere updates postimage timestamp' '
0e496492	182	newmtimepost=$(test-tool chmtime -v +0 $rr/postimage \| cut -f 1) &&
8aed4a5e JH	183	test $oldmtimepost -lt $newmtimepost
8aed4a5e JH	184	'
56cf9806	185
f7314882	186	test_expect_success 'rerere clear' '
05dd9f13	187	mv $rr/postimage .git/post-saved &&
94221d22	188	echo "$sha1 a1" \| perl -pe "y/\012/\000/" >.git/MERGE_RR &&
f7314882 JN	189	git rerere clear &&
	190	! test -d $rr
	191	'
56cf9806	192
05dd9f13 JH	193	test_expect_success 'leftover directory' '
	194	git reset --hard &&
	195	mkdir -p $rr &&
	196	test_must_fail git merge first &&
	197	test -f $rr/preimage
	198	'
	199
	200	test_expect_success 'missing preimage' '
	201	git reset --hard &&
	202	mkdir -p $rr &&
	203	cp .git/post-saved $rr/postimage &&
	204	test_must_fail git merge first &&
	205	test -f $rr/preimage
	206	'
	207
f7314882 JN	208	test_expect_success 'set up for garbage collection tests' '
	209	mkdir -p $rr &&
	210	echo Hello >$rr/preimage &&
	211	echo World >$rr/postimage &&
56cf9806	212
f7314882 JN	213	sha2=4000000000000000000000000000000000000000 &&
	214	rr2=.git/rr-cache/$sha2 &&
	215	mkdir $rr2 &&
	216	echo Hello >$rr2/preimage &&
56cf9806	217
f7314882 JN	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)) &&
56cf9806	222
0e496492 NTND	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
f7314882	226	'
56cf9806	227
8aed4a5e	228	test_expect_success 'gc preserves young or recently used records' '
f7314882 JN	229	git rerere gc &&
	230	test -f $rr/preimage &&
	231	test -f $rr2/preimage
	232	'
ad8e72cb	233
f7314882	234	test_expect_success 'old records rest in peace' '
0e496492 NTND	235	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
0e496492 NTND	236	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
f7314882 JN	237	git rerere gc &&
	238	! test -f $rr/preimage &&
	239	! test -f $rr2/preimage
	240	'
ad8e72cb	241
e579aaa6 JH	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/$_z40 &&
	247	mkdir -p "$rr" &&
	248	>"$rr/preimage" &&
	249	>"$rr/postimage" &&
	250
	251	two_days_ago=$((-2*86400)) &&
0e496492 NTND	252	test-tool chmtime =$two_days_ago "$rr/preimage" &&
0e496492 NTND	253	test-tool chmtime =$two_days_ago "$rr/postimage" &&
e579aaa6 JH	254
	255	find .git/rr-cache -type f \| sort >original &&
	256
	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 &&
	261
	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 &&
	266
	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	>expect &&
	271	test_cmp expect actual
	272	'
	273	}
	274
	275	rerere_gc_custom_expiry_test 5 0
1ad8b473	276
6e96cb52 JH	277	rerere_gc_custom_expiry_test 5.days.ago now
6e96cb52 JH	278
f7314882	279	test_expect_success 'setup: file2 added differently in two branches' '
52aaf649	280	git reset --hard &&
f7314882	281
52aaf649	282	git checkout -b fourth &&
f7314882	283	echo Hallo >file2 &&
52aaf649	284	git add file2 &&
f7314882	285	test_tick &&
52aaf649	286	git commit -m version1 &&
f7314882	287
52aaf649	288	git checkout third &&
f7314882	289	echo Bello >file2 &&
52aaf649	290	git add file2 &&
f7314882	291	test_tick &&
52aaf649	292	git commit -m version2 &&
f7314882	293
d492b31c	294	test_must_fail git merge fourth &&
f7314882	295	echo Cello >file2 &&
52aaf649 JS	296	git add file2 &&
	297	git commit -m resolution
	298	'
	299
	300	test_expect_success 'resolution was recorded properly' '
f7314882 JN	301	echo Cello >expected &&
f7314882 JN	302
52aaf649 JS	303	git reset --hard HEAD~2 &&
52aaf649 JS	304	git checkout -b fifth &&
f7314882 JN	305
f7314882 JN	306	echo Hallo >file3 &&
52aaf649	307	git add file3 &&
f7314882	308	test_tick &&
52aaf649	309	git commit -m version1 &&
f7314882	310
52aaf649	311	git checkout third &&
f7314882	312	echo Bello >file3 &&
52aaf649	313	git add file3 &&
f7314882	314	test_tick &&
52aaf649	315	git commit -m version2 &&
121c813f	316	git tag version2 &&
f7314882	317
7f8365f8	318	test_must_fail git merge fifth &&
f7314882 JN	319	test_cmp expected file3 &&
f7314882 JN	320	test_must_fail git update-index --refresh
52aaf649 JS	321	'
52aaf649 JS	322
121c813f	323	test_expect_success 'rerere.autoupdate' '
f7314882	324	git config rerere.autoupdate true &&
121c813f JH	325	git reset --hard &&
	326	git checkout version2 &&
	327	test_must_fail git merge fifth &&
f7314882	328	git update-index --refresh
cb6020bb	329	'
121c813f	330
cb6020bb	331	test_expect_success 'merge --rerere-autoupdate' '
f7314882	332	test_might_fail git config --unset rerere.autoupdate &&
cb6020bb JH	333	git reset --hard &&
	334	git checkout version2 &&
	335	test_must_fail git merge --rerere-autoupdate fifth &&
f7314882	336	git update-index --refresh
cb6020bb JH	337	'
	338
	339	test_expect_success 'merge --no-rerere-autoupdate' '
f7314882 JN	340	headblob=$(git rev-parse version2:file3) &&
	341	mergeblob=$(git rev-parse fifth:file3) &&
	342	cat >expected <<-EOF &&
	343	100644 $headblob 2 file3
	344	100644 $mergeblob 3 file3
	345	EOF
	346
	347	git config rerere.autoupdate true &&
cb6020bb JH	348	git reset --hard &&
	349	git checkout version2 &&
	350	test_must_fail git merge --no-rerere-autoupdate fifth &&
f7314882 JN	351	git ls-files -u >actual &&
f7314882 JN	352	test_cmp expected actual
121c813f JH	353	'
121c813f JH	354
672d1b78 JN	355	test_expect_success 'set up an unresolved merge' '
	356	headblob=$(git rev-parse version2:file3) &&
	357	mergeblob=$(git rev-parse fifth:file3) &&
	358	cat >expected.unresolved <<-EOF &&
	359	100644 $headblob 2 file3
	360	100644 $mergeblob 3 file3
	361	EOF
	362
	363	test_might_fail git config --unset rerere.autoupdate &&
	364	git reset --hard &&
	365	git checkout version2 &&
	366	fifth=$(git rev-parse fifth) &&
	367	echo "$fifth branch 'fifth' of ." \|
	368	git fmt-merge-msg >msg &&
	369	ancestor=$(git merge-base version2 fifth) &&
	370	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
	371
	372	git ls-files --stage >failedmerge &&
	373	cp file3 file3.conflict &&
	374
	375	git ls-files -u >actual &&
	376	test_cmp expected.unresolved actual
	377	'
	378
	379	test_expect_success 'explicit rerere' '
	380	test_might_fail git config --unset rerere.autoupdate &&
	381	git rm -fr --cached . &&
	382	git update-index --index-info <failedmerge &&
	383	cp file3.conflict file3 &&
	384	test_must_fail git update-index --refresh -q &&
	385
	386	git rerere &&
	387	git ls-files -u >actual &&
	388	test_cmp expected.unresolved actual
	389	'
	390
	391	test_expect_success 'explicit rerere with autoupdate' '
	392	git config rerere.autoupdate true &&
	393	git rm -fr --cached . &&
	394	git update-index --index-info <failedmerge &&
	395	cp file3.conflict file3 &&
	396	test_must_fail git update-index --refresh -q &&
	397
	398	git rerere &&
	399	git update-index --refresh
	400	'
	401
	402	test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
	403	git config rerere.autoupdate false &&
	404	git rm -fr --cached . &&
	405	git update-index --index-info <failedmerge &&
	406	cp file3.conflict file3 &&
	407	git rerere &&
	408	git ls-files -u >actual1 &&
	409
	410	git rm -fr --cached . &&
	411	git update-index --index-info <failedmerge &&
	412	cp file3.conflict file3 &&
	413	git rerere --rerere-autoupdate &&
	414	git update-index --refresh &&
	415
	416	git rm -fr --cached . &&
	417	git update-index --index-info <failedmerge &&
	418	cp file3.conflict file3 &&
419	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
420	git ls-files -u >actual2 &&
421
422	git rm -fr --cached . &&
423	git update-index --index-info <failedmerge &&
424	cp file3.conflict file3 &&
425	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
426	git update-index --refresh &&
427
428	test_cmp expected.unresolved actual1 &&
429	test_cmp expected.unresolved actual2
430	'
431
432	test_expect_success 'rerere --no-no-rerere-autoupdate' '
433	git rm -fr --cached . &&
434	git update-index --index-info <failedmerge &&
435	cp file3.conflict file3 &&
436	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
9a001381	437	test_i18ngrep [Uu]sage err &&
672d1b78 JN	438	test_must_fail git update-index --refresh
	439	'
	440
	441	test_expect_success 'rerere -h' '
	442	test_must_fail git rerere -h >help &&
9a001381	443	test_i18ngrep [Uu]sage help
121c813f JH	444	'
121c813f JH	445
82efa6e2 JH	446	concat_insert () {
	447	last=$1
	448	shift
	449	cat early && printf "%s\n" "$@" && cat late "$last"
	450	}
	451
1be1e851 JH	452	count_pre_post () {
	453	find .git/rr-cache/ -type f -name "preimage*" >actual &&
	454	test_line_count = "$1" actual &&
	455	find .git/rr-cache/ -type f -name "postimage*" >actual &&
	456	test_line_count = "$2" actual
	457	}
	458
1be1e851 JH	459	merge_conflict_resolve () {
	460	git reset --hard &&
	461	test_must_fail git merge six.1 &&
	462	# Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
	463	concat_insert short 6.1 6.2 >file1 &&
	464	concat_insert long 6.1 6.2 >file2
	465	}
	466
629716d2	467	test_expect_success 'multiple identical conflicts' '
780fbeba JH	468	rm -fr .git/rr-cache &&
780fbeba JH	469	mkdir .git/rr-cache &&
82efa6e2 JH	470	git reset --hard &&
	471
	472	test_seq 1 6 >early &&
	473	>late &&
	474	test_seq 11 15 >short &&
	475	test_seq 111 120 >long &&
	476	concat_insert short >file1 &&
	477	concat_insert long >file2 &&
	478	git add file1 file2 &&
	479	git commit -m base &&
	480	git tag base &&
	481	git checkout -b six.1 &&
	482	concat_insert short 6.1 >file1 &&
	483	concat_insert long 6.1 >file2 &&
	484	git add file1 file2 &&
	485	git commit -m 6.1 &&
	486	git checkout -b six.2 HEAD^ &&
	487	concat_insert short 6.2 >file1 &&
	488	concat_insert long 6.2 >file2 &&
	489	git add file1 file2 &&
	490	git commit -m 6.2 &&
	491
	492	# At this point, six.1 and six.2
	493	# - derive from common ancestor that has two files
	494	# 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
	495	# - six.1 replaces these 7s with 6.1
	496	# - six.2 replaces these 7s with 6.2
	497
1be1e851	498	merge_conflict_resolve &&
82efa6e2 JH	499
	500	# Check that rerere knows that file1 and file2 have conflicts
	501
	502	printf "%s\n" file1 file2 >expect &&
	503	git ls-files -u \| sed -e "s/^.* //" \| sort -u >actual &&
	504	test_cmp expect actual &&
	505
	506	git rerere status \| sort >actual &&
	507	test_cmp expect actual &&
	508
82efa6e2 JH	509	git rerere remaining >actual &&
	510	test_cmp expect actual &&
	511
1be1e851 JH	512	count_pre_post 2 0 &&
	513
	514	# Pretend that the conflicts were made quite some time ago
0e496492	515	find .git/rr-cache/ -type f \| xargs test-tool chmtime -172800 &&
1be1e851 JH	516
	517	# Unresolved entries have not expired yet
	518	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
	519	count_pre_post 2 0 &&
	520
	521	# Unresolved entries have expired
	522	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
	523	count_pre_post 0 0 &&
	524
	525	# Recreate the conflicted state
	526	merge_conflict_resolve &&
	527	count_pre_post 2 0 &&
	528
	529	# Clear it
	530	git rerere clear &&
	531	count_pre_post 0 0 &&
	532
	533	# Recreate the conflicted state
	534	merge_conflict_resolve &&
	535	count_pre_post 2 0 &&
	536
82efa6e2 JH	537	# We resolved file1 and file2
	538	git rerere &&
	539	>expect &&
	540	git rerere remaining >actual &&
	541	test_cmp expect actual &&
	542
1be1e851 JH	543	# We must have recorded both of them
	544	count_pre_post 2 2 &&
	545
82efa6e2 JH	546	# Now we should be able to resolve them both
	547	git reset --hard &&
	548	test_must_fail git merge six.1 &&
	549	git rerere &&
	550
	551	>expect &&
	552	git rerere remaining >actual &&
	553	test_cmp expect actual &&
	554
	555	concat_insert short 6.1 6.2 >file1.expect &&
	556	concat_insert long 6.1 6.2 >file2.expect &&
	557	test_cmp file1.expect file1 &&
1be1e851 JH	558	test_cmp file2.expect file2 &&
1be1e851 JH	559
890fca84 JH	560	# Forget resolution for file2
	561	git rerere forget file2 &&
	562	echo file2 >expect &&
	563	git rerere status >actual &&
	564	test_cmp expect actual &&
	565	count_pre_post 2 1 &&
	566
	567	# file2 already has correct resolution, so record it again
	568	git rerere &&
	569
1be1e851	570	# Pretend that the resolutions are old again
0e496492	571	find .git/rr-cache/ -type f \| xargs test-tool chmtime -172800 &&
1be1e851 JH	572
	573	# Resolved entries have not expired yet
	574	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
	575
	576	count_pre_post 2 2 &&
	577
	578	# Resolved entries have expired
	579	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
	580	count_pre_post 0 0
82efa6e2 JH	581	'
82efa6e2 JH	582
ad8e72cb	583	test_done