[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
   ! [main] 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
++++++ [main] initial
'

GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./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 main &&
	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 --get -60 $rr/postimage) &&

	git checkout -b third main &&
	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 --get $rr/postimage) &&
	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=$(test_oid deadbeef) &&
	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/$ZERO_OID &&
		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 &&
		test_must_be_empty 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
	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&

	# 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 &&
	git rerere remaining >actual &&
	test_must_be_empty 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 &&

	git rerere remaining >actual &&
	test_must_be_empty 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
	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&

	# 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_expect_success 'rerere with unexpected conflict markers does not crash' '
	git reset --hard &&

	git checkout -b branch-1 main &&
	echo "bar" >test &&
	git add test &&
	git commit -q -m two &&

	git reset --hard &&
	git checkout -b branch-2 main &&
	echo "foo" >test &&
	git add test &&
	git commit -q -a -m one &&

	test_must_fail git merge branch-1 &&
	echo "<<<<<<< a" >test &&
	git rerere &&

	git rerere clear
'

test_expect_success 'rerere with inner conflict markers' '
	git reset --hard &&

	git checkout -b A main &&
	echo "bar" >test &&
	git add test &&
	git commit -q -m two &&
	echo "baz" >test &&
	git add test &&
	git commit -q -m three &&

	git reset --hard &&
	git checkout -b B main &&
	echo "foo" >test &&
	git add test &&
	git commit -q -a -m one &&

	test_must_fail git merge A~ &&
	git add test &&
	git commit -q -m "will solve conflicts later" &&
	test_must_fail git merge A &&

	echo "resolved" >test &&
	git add test &&
	git commit -q -m "solved conflict" &&

	echo "resolved" >expect &&

	git reset --hard HEAD~~ &&
	test_must_fail git merge A~ &&
	git add test &&
	git commit -q -m "will solve conflicts later" &&
	test_must_fail git merge A &&
	cat test >actual &&
	test_cmp expect actual &&

	git add test &&
	git commit -m "rerere solved conflict" &&
	git reset --hard HEAD~ &&
	test_must_fail git merge A &&
	cat test >actual &&
	test_cmp expect actual
'

test_expect_success 'setup simple stage 1 handling' '
	test_create_repo stage_1_handling &&
	(
		cd stage_1_handling &&

		test_seq 1 10 >original &&
		git add original &&
		git commit -m original &&

		git checkout -b A main &&
		git mv original A &&
		git commit -m "rename to A" &&

		git checkout -b B main &&
		git mv original B &&
		git commit -m "rename to B"
	)
'

test_expect_success 'test simple stage 1 handling' '
	(
		cd stage_1_handling &&

		git config rerere.enabled true &&
		git checkout A^0 &&
		test_must_fail git merge B^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
8f37854b	11	! [main] initial
f7314882 JN	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
8f37854b	22	++++++ [main] initial
ad8e72cb JS	23	'
ad8e72cb JS	24
8f37854b	25	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
334afbc7 JS	26	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
334afbc7 JS	27
ad8e72cb JS	28	. ./test-lib.sh
ad8e72cb JS	29
f7314882 JN	30	test_expect_success 'setup' '
f7314882 JN	31	cat >a1 <<-\EOF &&
4a45f7dd BG	32	Some title
4a45f7dd BG	33	==========
f7314882	34	Whether '\''tis nobler in the mind to suffer
4a45f7dd BG	35	The slings and arrows of outrageous fortune,
	36	Or to take arms against a sea of troubles,
	37	And by opposing end them? To die: to sleep;
	38	No more; and by a sleep to say we end
	39	The heart-ache and the thousand natural shocks
f7314882 JN	40	That flesh is heir to, '\''tis a consummation
f7314882 JN	41	Devoutly to be wish'\''d.
4a45f7dd	42	EOF
ad8e72cb	43
4a45f7dd	44	git add a1 &&
f7314882	45	test_tick &&
4a45f7dd	46	git commit -q -a -m initial &&
ad8e72cb	47
f7314882	48	cat >>a1 <<-\EOF &&
4a45f7dd BG	49	Some title
	50	==========
	51	To die, to sleep;
f7314882	52	To sleep: perchance to dream: ay, there'\''s the rub;
4a45f7dd BG	53	For in that sleep of death what dreams may come
4a45f7dd BG	54	When we have shuffled off this mortal coil,
f7314882	55	Must give us pause: there'\''s the respect
4a45f7dd BG	56	That makes calamity of so long life;
4a45f7dd BG	57	EOF
f7314882 JN	58
	59	git checkout -b first &&
	60	test_tick &&
4a45f7dd	61	git commit -q -a -m first &&
ad8e72cb	62
8f37854b	63	git checkout -b second main &&
4a45f7dd	64	git show first:a1 \|
f7314882 JN	65	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
	66	echo "* END *" >>a1 &&
	67	test_tick &&
4a45f7dd	68	git commit -q -a -m second
f7314882	69	'
ad8e72cb	70
b4372ef1	71	test_expect_success 'nothing recorded without rerere' '
f7314882 JN	72	rm -rf .git/rr-cache &&
f7314882 JN	73	git config rerere.enabled false &&
d492b31c	74	test_must_fail git merge first &&
b4372ef1 JS	75	! test -d .git/rr-cache
b4372ef1 JS	76	'
ad8e72cb	77
f7314882	78	test_expect_success 'activate rerere, old style (conflicting merge)' '
b4372ef1 JS	79	git reset --hard &&
b4372ef1 JS	80	mkdir .git/rr-cache &&
f7314882 JN	81	test_might_fail git config --unset rerere.enabled &&
f7314882 JN	82	test_must_fail git merge first &&
ad8e72cb	83
94221d22	84	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882 JN	85	rr=.git/rr-cache/$sha1 &&
	86	grep "^=======\$" $rr/preimage &&
	87	! test -f $rr/postimage &&
	88	! test -f $rr/thisimage
	89	'
ad8e72cb	90
b4372ef1 JS	91	test_expect_success 'rerere.enabled works, too' '
	92	rm -rf .git/rr-cache &&
	93	git config rerere.enabled true &&
	94	git reset --hard &&
d492b31c	95	test_must_fail git merge first &&
f7314882	96
94221d22	97	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882	98	rr=.git/rr-cache/$sha1 &&
99d698f1	99	grep ^=======$ $rr/preimage
b4372ef1 JS	100	'
b4372ef1 JS	101
f7314882 JN	102	test_expect_success 'set up rr-cache' '
	103	rm -rf .git/rr-cache &&
	104	git config rerere.enabled true &&
	105	git reset --hard &&
	106	test_must_fail git merge first &&
94221d22	107	sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
f7314882 JN	108	rr=.git/rr-cache/$sha1
f7314882 JN	109	'
ad8e72cb	110
f7314882 JN	111	test_expect_success 'rr-cache looks sane' '
	112	# no postimage or thisimage yet
	113	! test -f $rr/postimage &&
	114	! test -f $rr/thisimage &&
eb335966	115
f7314882	116	# preimage has right number of lines
eb335966	117	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage \| wc -l) &&
f7314882	118	echo $cnt &&
99d698f1	119	test $cnt = 13
eb335966 JH	120	'
eb335966 JH	121
f7314882 JN	122	test_expect_success 'rerere diff' '
	123	git show first:a1 >a1 &&
	124	cat >expect <<-\EOF &&
	125	--- a/a1
	126	+++ b/a1
	127	@@ -1,4 +1,4 @@
	128	-Some Title
	129	+Some title
	130	==========
	131	Whether '\''tis nobler in the mind to suffer
	132	The slings and arrows of outrageous fortune,
	133	@@ -8,21 +8,11 @@
	134	The heart-ache and the thousand natural shocks
	135	That flesh is heir to, '\''tis a consummation
	136	Devoutly to be wish'\''d.
	137	-<<<<<<<
	138	-Some Title
	139	-==========
	140	-To die! To sleep;
	141	-=======
	142	Some title
	143	==========
	144	To die, to sleep;
	145	->>>>>>>
	146	To sleep: perchance to dream: ay, there'\''s the rub;
	147	For in that sleep of death what dreams may come
	148	When we have shuffled off this mortal coil,
	149	Must give us pause: there'\''s the respect
	150	That makes calamity of so long life;
	151	-<<<<<<<
	152	-=======
	153	-* END *
	154	->>>>>>>
	155	EOF
	156	git rerere diff >out &&
	157	test_cmp expect out
52aaf649	158	'
ad8e72cb	159
f7314882 JN	160	test_expect_success 'rerere status' '
	161	echo a1 >expect &&
	162	git rerere status >out &&
	163	test_cmp expect out
7d7ff15b SG	164	'
7d7ff15b SG	165
f7314882 JN	166	test_expect_success 'first postimage wins' '
f7314882 JN	167	git show first:a1 \| sed "s/To die: t/To die! T/" >expect &&
ad8e72cb	168
f7314882 JN	169	git commit -q -a -m "prefer first over second" &&
f7314882 JN	170	test -f $rr/postimage &&
ad8e72cb	171
deb9845a	172	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
ad8e72cb	173
8f37854b	174	git checkout -b third main &&
f7314882 JN	175	git show second^:a1 \| sed "s/To die: t/To die! T/" >a1 &&
f7314882 JN	176	git commit -q -a -m third &&
ad8e72cb	177
501a75a7	178	test_must_fail git merge first &&
f7314882 JN	179	# rerere kicked in
	180	! grep "^=======\$" a1 &&
	181	test_cmp expect a1
	182	'
ad8e72cb	183
8aed4a5e	184	test_expect_success 'rerere updates postimage timestamp' '
deb9845a	185	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
8aed4a5e JH	186	test $oldmtimepost -lt $newmtimepost
8aed4a5e JH	187	'
56cf9806	188
f7314882	189	test_expect_success 'rerere clear' '
05dd9f13	190	mv $rr/postimage .git/post-saved &&
94221d22	191	echo "$sha1 a1" \| perl -pe "y/\012/\000/" >.git/MERGE_RR &&
f7314882 JN	192	git rerere clear &&
	193	! test -d $rr
	194	'
56cf9806	195
05dd9f13 JH	196	test_expect_success 'leftover directory' '
	197	git reset --hard &&
	198	mkdir -p $rr &&
	199	test_must_fail git merge first &&
	200	test -f $rr/preimage
	201	'
	202
	203	test_expect_success 'missing preimage' '
	204	git reset --hard &&
	205	mkdir -p $rr &&
	206	cp .git/post-saved $rr/postimage &&
	207	test_must_fail git merge first &&
	208	test -f $rr/preimage
	209	'
	210
f7314882 JN	211	test_expect_success 'set up for garbage collection tests' '
	212	mkdir -p $rr &&
	213	echo Hello >$rr/preimage &&
	214	echo World >$rr/postimage &&
56cf9806	215
717c939d	216	sha2=$(test_oid deadbeef) &&
f7314882 JN	217	rr2=.git/rr-cache/$sha2 &&
	218	mkdir $rr2 &&
	219	echo Hello >$rr2/preimage &&
56cf9806	220
f7314882 JN	221	almost_15_days_ago=$((60-15*86400)) &&
	222	just_over_15_days_ago=$((-1-15*86400)) &&
	223	almost_60_days_ago=$((60-60*86400)) &&
	224	just_over_60_days_ago=$((-1-60*86400)) &&
56cf9806	225
0e496492 NTND	226	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
	227	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
	228	test-tool chmtime =$almost_15_days_ago $rr2/preimage
f7314882	229	'
56cf9806	230
8aed4a5e	231	test_expect_success 'gc preserves young or recently used records' '
f7314882 JN	232	git rerere gc &&
	233	test -f $rr/preimage &&
	234	test -f $rr2/preimage
	235	'
ad8e72cb	236
f7314882	237	test_expect_success 'old records rest in peace' '
0e496492 NTND	238	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
0e496492 NTND	239	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
f7314882 JN	240	git rerere gc &&
	241	! test -f $rr/preimage &&
	242	! test -f $rr2/preimage
	243	'
ad8e72cb	244
e579aaa6 JH	245	rerere_gc_custom_expiry_test () {
	246	five_days="$1" right_now="$2"
	247	test_expect_success "rerere gc with custom expiry ($five_days, $right_now)" '
	248	rm -fr .git/rr-cache &&
8125a58b	249	rr=.git/rr-cache/$ZERO_OID &&
e579aaa6 JH	250	mkdir -p "$rr" &&
	251	>"$rr/preimage" &&
	252	>"$rr/postimage" &&
	253
	254	two_days_ago=$((-2*86400)) &&
0e496492 NTND	255	test-tool chmtime =$two_days_ago "$rr/preimage" &&
0e496492 NTND	256	test-tool chmtime =$two_days_ago "$rr/postimage" &&
e579aaa6 JH	257
	258	find .git/rr-cache -type f \| sort >original &&
	259
	260	git -c "gc.rerereresolved=$five_days" \
	261	-c "gc.rerereunresolved=$five_days" rerere gc &&
	262	find .git/rr-cache -type f \| sort >actual &&
	263	test_cmp original actual &&
	264
	265	git -c "gc.rerereresolved=$five_days" \
	266	-c "gc.rerereunresolved=$right_now" rerere gc &&
	267	find .git/rr-cache -type f \| sort >actual &&
	268	test_cmp original actual &&
	269
	270	git -c "gc.rerereresolved=$right_now" \
	271	-c "gc.rerereunresolved=$right_now" rerere gc &&
	272	find .git/rr-cache -type f \| sort >actual &&
d3c6751b	273	test_must_be_empty actual
e579aaa6 JH	274	'
	275	}
	276
	277	rerere_gc_custom_expiry_test 5 0
1ad8b473	278
6e96cb52 JH	279	rerere_gc_custom_expiry_test 5.days.ago now
6e96cb52 JH	280
f7314882	281	test_expect_success 'setup: file2 added differently in two branches' '
52aaf649	282	git reset --hard &&
f7314882	283
52aaf649	284	git checkout -b fourth &&
f7314882	285	echo Hallo >file2 &&
52aaf649	286	git add file2 &&
f7314882	287	test_tick &&
52aaf649	288	git commit -m version1 &&
f7314882	289
52aaf649	290	git checkout third &&
f7314882	291	echo Bello >file2 &&
52aaf649	292	git add file2 &&
f7314882	293	test_tick &&
52aaf649	294	git commit -m version2 &&
f7314882	295
d492b31c	296	test_must_fail git merge fourth &&
f7314882	297	echo Cello >file2 &&
52aaf649 JS	298	git add file2 &&
	299	git commit -m resolution
	300	'
	301
	302	test_expect_success 'resolution was recorded properly' '
f7314882 JN	303	echo Cello >expected &&
f7314882 JN	304
52aaf649 JS	305	git reset --hard HEAD~2 &&
52aaf649 JS	306	git checkout -b fifth &&
f7314882 JN	307
f7314882 JN	308	echo Hallo >file3 &&
52aaf649	309	git add file3 &&
f7314882	310	test_tick &&
52aaf649	311	git commit -m version1 &&
f7314882	312
52aaf649	313	git checkout third &&
f7314882	314	echo Bello >file3 &&
52aaf649	315	git add file3 &&
f7314882	316	test_tick &&
52aaf649	317	git commit -m version2 &&
121c813f	318	git tag version2 &&
f7314882	319
7f8365f8	320	test_must_fail git merge fifth &&
f7314882 JN	321	test_cmp expected file3 &&
f7314882 JN	322	test_must_fail git update-index --refresh
52aaf649 JS	323	'
52aaf649 JS	324
121c813f	325	test_expect_success 'rerere.autoupdate' '
f7314882	326	git config rerere.autoupdate true &&
121c813f JH	327	git reset --hard &&
	328	git checkout version2 &&
	329	test_must_fail git merge fifth &&
f7314882	330	git update-index --refresh
cb6020bb	331	'
121c813f	332
cb6020bb	333	test_expect_success 'merge --rerere-autoupdate' '
f7314882	334	test_might_fail git config --unset rerere.autoupdate &&
cb6020bb JH	335	git reset --hard &&
	336	git checkout version2 &&
	337	test_must_fail git merge --rerere-autoupdate fifth &&
f7314882	338	git update-index --refresh
cb6020bb JH	339	'
	340
	341	test_expect_success 'merge --no-rerere-autoupdate' '
f7314882 JN	342	headblob=$(git rev-parse version2:file3) &&
	343	mergeblob=$(git rev-parse fifth:file3) &&
	344	cat >expected <<-EOF &&
	345	100644 $headblob 2 file3
	346	100644 $mergeblob 3 file3
	347	EOF
	348
	349	git config rerere.autoupdate true &&
cb6020bb JH	350	git reset --hard &&
	351	git checkout version2 &&
	352	test_must_fail git merge --no-rerere-autoupdate fifth &&
f7314882 JN	353	git ls-files -u >actual &&
f7314882 JN	354	test_cmp expected actual
121c813f JH	355	'
121c813f JH	356
672d1b78 JN	357	test_expect_success 'set up an unresolved merge' '
	358	headblob=$(git rev-parse version2:file3) &&
	359	mergeblob=$(git rev-parse fifth:file3) &&
	360	cat >expected.unresolved <<-EOF &&
	361	100644 $headblob 2 file3
	362	100644 $mergeblob 3 file3
	363	EOF
	364
	365	test_might_fail git config --unset rerere.autoupdate &&
	366	git reset --hard &&
	367	git checkout version2 &&
	368	fifth=$(git rev-parse fifth) &&
c76b84a1	369	echo "$fifth branch fifth of ." \|
672d1b78 JN	370	git fmt-merge-msg >msg &&
	371	ancestor=$(git merge-base version2 fifth) &&
	372	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
	373
	374	git ls-files --stage >failedmerge &&
	375	cp file3 file3.conflict &&
	376
	377	git ls-files -u >actual &&
	378	test_cmp expected.unresolved actual
	379	'
	380
	381	test_expect_success 'explicit rerere' '
	382	test_might_fail git config --unset rerere.autoupdate &&
	383	git rm -fr --cached . &&
	384	git update-index --index-info <failedmerge &&
	385	cp file3.conflict file3 &&
	386	test_must_fail git update-index --refresh -q &&
	387
	388	git rerere &&
	389	git ls-files -u >actual &&
	390	test_cmp expected.unresolved actual
	391	'
	392
	393	test_expect_success 'explicit rerere with autoupdate' '
	394	git config rerere.autoupdate true &&
	395	git rm -fr --cached . &&
	396	git update-index --index-info <failedmerge &&
	397	cp file3.conflict file3 &&
	398	test_must_fail git update-index --refresh -q &&
	399
	400	git rerere &&
	401	git update-index --refresh
	402	'
	403
	404	test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
	405	git config rerere.autoupdate false &&
	406	git rm -fr --cached . &&
	407	git update-index --index-info <failedmerge &&
	408	cp file3.conflict file3 &&
	409	git rerere &&
	410	git ls-files -u >actual1 &&
	411
	412	git rm -fr --cached . &&
	413	git update-index --index-info <failedmerge &&
	414	cp file3.conflict file3 &&
	415	git rerere --rerere-autoupdate &&
	416	git update-index --refresh &&
	417
	418	git rm -fr --cached . &&
	419	git update-index --index-info <failedmerge &&
	420	cp file3.conflict file3 &&
	421	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
	422	git ls-files -u >actual2 &&
	423
	424	git rm -fr --cached . &&
	425	git update-index --index-info <failedmerge &&
	426	cp file3.conflict file3 &&
	427	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
	428	git update-index --refresh &&
	429
	430	test_cmp expected.unresolved actual1 &&
	431	test_cmp expected.unresolved actual2
	432	'
	433
434	test_expect_success 'rerere --no-no-rerere-autoupdate' '
435	git rm -fr --cached . &&
436	git update-index --index-info <failedmerge &&
437	cp file3.conflict file3 &&
438	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
9a001381	439	test_i18ngrep [Uu]sage err &&
672d1b78 JN	440	test_must_fail git update-index --refresh
	441	'
	442
	443	test_expect_success 'rerere -h' '
	444	test_must_fail git rerere -h >help &&
9a001381	445	test_i18ngrep [Uu]sage help
121c813f JH	446	'
121c813f JH	447
82efa6e2 JH	448	concat_insert () {
	449	last=$1
	450	shift
	451	cat early && printf "%s\n" "$@" && cat late "$last"
	452	}
	453
1be1e851 JH	454	count_pre_post () {
	455	find .git/rr-cache/ -type f -name "preimage*" >actual &&
	456	test_line_count = "$1" actual &&
	457	find .git/rr-cache/ -type f -name "postimage*" >actual &&
	458	test_line_count = "$2" actual
	459	}
	460
1be1e851 JH	461	merge_conflict_resolve () {
	462	git reset --hard &&
	463	test_must_fail git merge six.1 &&
	464	# Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
	465	concat_insert short 6.1 6.2 >file1 &&
	466	concat_insert long 6.1 6.2 >file2
	467	}
	468
629716d2	469	test_expect_success 'multiple identical conflicts' '
780fbeba JH	470	rm -fr .git/rr-cache &&
780fbeba JH	471	mkdir .git/rr-cache &&
82efa6e2 JH	472	git reset --hard &&
	473
	474	test_seq 1 6 >early &&
	475	>late &&
	476	test_seq 11 15 >short &&
	477	test_seq 111 120 >long &&
	478	concat_insert short >file1 &&
	479	concat_insert long >file2 &&
	480	git add file1 file2 &&
	481	git commit -m base &&
	482	git tag base &&
	483	git checkout -b six.1 &&
	484	concat_insert short 6.1 >file1 &&
	485	concat_insert long 6.1 >file2 &&
	486	git add file1 file2 &&
	487	git commit -m 6.1 &&
	488	git checkout -b six.2 HEAD^ &&
	489	concat_insert short 6.2 >file1 &&
	490	concat_insert long 6.2 >file2 &&
	491	git add file1 file2 &&
	492	git commit -m 6.2 &&
	493
	494	# At this point, six.1 and six.2
	495	# - derive from common ancestor that has two files
	496	# 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
	497	# - six.1 replaces these 7s with 6.1
	498	# - six.2 replaces these 7s with 6.2
	499
1be1e851	500	merge_conflict_resolve &&
82efa6e2 JH	501
	502	# Check that rerere knows that file1 and file2 have conflicts
	503
	504	printf "%s\n" file1 file2 >expect &&
	505	git ls-files -u \| sed -e "s/^.* //" \| sort -u >actual &&
	506	test_cmp expect actual &&
	507
	508	git rerere status \| sort >actual &&
	509	test_cmp expect actual &&
	510
82efa6e2 JH	511	git rerere remaining >actual &&
	512	test_cmp expect actual &&
	513
1be1e851 JH	514	count_pre_post 2 0 &&
	515
	516	# Pretend that the conflicts were made quite some time ago
deb9845a	517	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
1be1e851 JH	518
	519	# Unresolved entries have not expired yet
	520	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
	521	count_pre_post 2 0 &&
	522
	523	# Unresolved entries have expired
	524	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
	525	count_pre_post 0 0 &&
	526
	527	# Recreate the conflicted state
	528	merge_conflict_resolve &&
	529	count_pre_post 2 0 &&
	530
	531	# Clear it
	532	git rerere clear &&
	533	count_pre_post 0 0 &&
	534
	535	# Recreate the conflicted state
	536	merge_conflict_resolve &&
	537	count_pre_post 2 0 &&
	538
82efa6e2 JH	539	# We resolved file1 and file2
82efa6e2 JH	540	git rerere &&
82efa6e2	541	git rerere remaining >actual &&
d3c6751b	542	test_must_be_empty actual &&
82efa6e2	543
1be1e851 JH	544	# We must have recorded both of them
	545	count_pre_post 2 2 &&
	546
82efa6e2 JH	547	# Now we should be able to resolve them both
	548	git reset --hard &&
	549	test_must_fail git merge six.1 &&
	550	git rerere &&
	551
82efa6e2	552	git rerere remaining >actual &&
d3c6751b	553	test_must_be_empty actual &&
82efa6e2 JH	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
deb9845a	571	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
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
93406a28 TG	583	test_expect_success 'rerere with unexpected conflict markers does not crash' '
	584	git reset --hard &&
	585
8f37854b	586	git checkout -b branch-1 main &&
93406a28 TG	587	echo "bar" >test &&
	588	git add test &&
	589	git commit -q -m two &&
	590
	591	git reset --hard &&
8f37854b	592	git checkout -b branch-2 main &&
93406a28 TG	593	echo "foo" >test &&
	594	git add test &&
	595	git commit -q -a -m one &&
	596
	597	test_must_fail git merge branch-1 &&
	598	echo "<<<<<<< a" >test &&
	599	git rerere &&
	600
	601	git rerere clear
	602	'
	603
4af32207 TG	604	test_expect_success 'rerere with inner conflict markers' '
	605	git reset --hard &&
	606
8f37854b	607	git checkout -b A main &&
4af32207 TG	608	echo "bar" >test &&
	609	git add test &&
	610	git commit -q -m two &&
	611	echo "baz" >test &&
	612	git add test &&
	613	git commit -q -m three &&
	614
	615	git reset --hard &&
8f37854b	616	git checkout -b B main &&
4af32207 TG	617	echo "foo" >test &&
	618	git add test &&
	619	git commit -q -a -m one &&
	620
	621	test_must_fail git merge A~ &&
	622	git add test &&
	623	git commit -q -m "will solve conflicts later" &&
	624	test_must_fail git merge A &&
	625
	626	echo "resolved" >test &&
	627	git add test &&
	628	git commit -q -m "solved conflict" &&
	629
	630	echo "resolved" >expect &&
	631
	632	git reset --hard HEAD~~ &&
	633	test_must_fail git merge A~ &&
	634	git add test &&
	635	git commit -q -m "will solve conflicts later" &&
	636	test_must_fail git merge A &&
	637	cat test >actual &&
bd7dfa54 TG	638	test_cmp expect actual &&
	639
	640	git add test &&
	641	git commit -m "rerere solved conflict" &&
	642	git reset --hard HEAD~ &&
	643	test_must_fail git merge A &&
	644	cat test >actual &&
4af32207 TG	645	test_cmp expect actual
	646	'
	647
38c93c4d EN	648	test_expect_success 'setup simple stage 1 handling' '
	649	test_create_repo stage_1_handling &&
	650	(
	651	cd stage_1_handling &&
	652
	653	test_seq 1 10 >original &&
	654	git add original &&
	655	git commit -m original &&
	656
8f37854b	657	git checkout -b A main &&
38c93c4d EN	658	git mv original A &&
	659	git commit -m "rename to A" &&
	660
8f37854b	661	git checkout -b B main &&
38c93c4d EN	662	git mv original B &&
	663	git commit -m "rename to B"
	664	)
	665	'
	666
ad2bf0d9	667	test_expect_success 'test simple stage 1 handling' '
38c93c4d EN	668	(
	669	cd stage_1_handling &&
	670
	671	git config rerere.enabled true &&
	672	git checkout A^0 &&
	673	test_must_fail git merge B^0
	674	)
	675	'
	676
ad8e72cb	677	test_done