X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4200-rerere.sh;h=cfcdb69dc890aed55eabf9ec8d13529538e50465;hb=96b2d4fa927c5055adc5b1d08f10a5d7352e2989;hp=8b611bbea210551d86016b53718ba1af313f1353;hpb=1f71372711a18ccb3af1114e860f82dcb3ba8152;p=git.git

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 8b611bbea..cfcdb69dc 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Johannes E. Schindelin
 #
 
-test_description='git-rerere
+test_description='git rerere
 '
 
 . ./test-lib.sh
@@ -35,25 +35,43 @@ 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/life;$/life./' > a1
+sed -e 's/To die, t/To die! T/' > a1
+echo "* END *" >>a1
 git commit -q -a -m second
 
-# activate rerere
-mkdir .git/rr-cache
+test_expect_success 'nothing recorded without rerere' '
+	(rm -rf .git/rr-cache; git config rerere.enabled false) &&
+	! git merge first &&
+	! test -d .git/rr-cache
+'
 
-test_expect_failure 'conflicting merge' 'git pull . first'
+# activate rerere, old style
+test_expect_success 'conflicting merge' '
+	git reset --hard &&
+	mkdir .git/rr-cache &&
+	git config --unset rerere.enabled &&
+	! git merge first
+'
 
-sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
+sha1=$(sed -e 's/	.*//' .git/rr-cache/MERGE_RR)
 rr=.git/rr-cache/$sha1
 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
 
+test_expect_success 'rerere.enabled works, too' '
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled true &&
+	git reset --hard &&
+	! git merge first &&
+	grep ======= $rr/preimage
+'
+
 test_expect_success 'no postimage or thisimage yet' \
 	"test ! -f $rr/postimage -a ! -f $rr/thisimage"
 
-test_expect_success 'preimage have right number of lines' '
+test_expect_success 'preimage has right number of lines' '
 
 	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
-	test "$cnt" = 10
+	test $cnt = 9
 
 '
 
@@ -75,10 +93,10 @@ cat > expect << EOF
  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;
 -<<<<<<<
--That makes calamity of so long life.
 -=======
- That makes calamity of so long life;
+-* END *
 ->>>>>>>
 EOF
 git rerere diff > out
@@ -98,11 +116,12 @@ test_expect_success 'commit succeeds' \
 
 test_expect_success 'recorded postimage' "test -f $rr/postimage"
 
-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_expect_failure 'another conflicting merge' 'git pull . first'
+test_expect_success 'another conflicting merge' '
+	git checkout -b third master &&
+	git show second^:a1 | sed "s/To die: t/To die! T/" > a1 &&
+	git commit -q -a -m third &&
+	! git pull . first
+'
 
 git show first:a1 | sed 's/To die: t/To die! T/' > expect
 test_expect_success 'rerere kicked in' "! grep ======= a1"
@@ -146,6 +165,37 @@ test_expect_success 'garbage collection (part2)' 'git rerere gc'
 test_expect_success 'old records rest in peace' \
 	"test ! -f $rr/preimage && test ! -f $rr2/preimage"
 
-test_done
+test_expect_success 'file2 added differently in two branches' '
+	git reset --hard &&
+	git checkout -b fourth &&
+	echo Hallo > file2 &&
+	git add file2 &&
+	git commit -m version1 &&
+	git checkout third &&
+	echo Bello > file2 &&
+	git add file2 &&
+	git commit -m version2 &&
+	! git merge fourth &&
+	sha1=$(sed -e "s/	.*//" .git/rr-cache/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	echo Cello > file2 &&
+	git add file2 &&
+	git commit -m resolution
+'
 
+test_expect_success 'resolution was recorded properly' '
+	git reset --hard HEAD~2 &&
+	git checkout -b fifth &&
+	echo Hallo > file3 &&
+	git add file3 &&
+	git commit -m version1 &&
+	git checkout third &&
+	echo Bello > file3 &&
+	git add file3 &&
+	git commit -m version2 &&
+	! git merge fifth &&
+	git diff-files -q &&
+	test Cello = "$(cat file3)"
+'
 
+test_done