X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft2030-unresolve-info.sh;h=cb7effe0a3e38eeba92b43682de9be68e677099e;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=ea65f391c1671b141d2d071aad0f7df7ca4ea4ac;hpb=4421a8235783d0664faa9a1d45be114fd7ad8206;p=git.git

diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index ea65f391c..cb7effe0a 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -36,21 +36,22 @@ prime_resolve_undo () {
 	test_must_fail git merge third^0 &&
 	echo merge does not leave anything &&
 	check_resolve_undo empty &&
-	echo different >file &&
-	git add file &&
+	echo different >fi/le &&
+	git add fi/le &&
 	echo resolving records &&
-	check_resolve_undo recorded file initial:file second:file third:file
+	check_resolve_undo recorded fi/le initial:fi/le second:fi/le third:fi/le
 }
 
 test_expect_success setup '
-	test_commit initial file first &&
+	mkdir fi &&
+	test_commit initial fi/le first &&
 	git branch side &&
 	git branch another &&
-	test_commit second file second &&
+	test_commit second fi/le second &&
 	git checkout side &&
-	test_commit third file third &&
+	test_commit third fi/le third &&
 	git checkout another &&
-	test_commit fourth file fourth &&
+	test_commit fourth fi/le fourth &&
 	git checkout master
 '
 
@@ -59,7 +60,7 @@ test_expect_success 'add records switch clears' '
 	test_tick &&
 	git commit -m merged &&
 	echo committing keeps &&
-	check_resolve_undo kept file initial:file second:file third:file &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 	git checkout second^0 &&
 	echo switching clears &&
 	check_resolve_undo cleared
@@ -70,15 +71,15 @@ test_expect_success 'rm records reset clears' '
 	test_tick &&
 	git commit -m merged &&
 	echo committing keeps &&
-	check_resolve_undo kept file initial:file second:file third:file &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
 	echo merge clears upfront &&
 	test_must_fail git merge fourth^0 &&
 	check_resolve_undo nuked &&
 
-	git rm -f file &&
+	git rm -f fi/le &&
 	echo resolving records &&
-	check_resolve_undo recorded file initial:file HEAD:file fourth:file &&
+	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
 
 	git reset --hard &&
 	echo resetting discards &&
@@ -90,7 +91,7 @@ test_expect_success 'plumbing clears' '
 	test_tick &&
 	git commit -m merged &&
 	echo committing keeps &&
-	check_resolve_undo kept file initial:file second:file third:file &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
 	echo plumbing clear &&
 	git update-index --clear-resolve-undo &&
@@ -100,7 +101,7 @@ test_expect_success 'plumbing clears' '
 test_expect_success 'add records checkout -m undoes' '
 	prime_resolve_undo &&
 	git diff HEAD &&
-	git checkout --conflict=merge file &&
+	git checkout --conflict=merge fi/le &&
 	echo checkout used the record and removed it &&
 	check_resolve_undo removed &&
 	echo the index and the work tree is unmerged again &&
@@ -108,4 +109,62 @@ test_expect_success 'add records checkout -m undoes' '
 	grep "^++<<<<<<<" actual
 '
 
+test_expect_success 'unmerge with plumbing' '
+	prime_resolve_undo &&
+	git update-index --unresolve fi/le &&
+	git ls-files -u >actual &&
+	test $(wc -l <actual) = 3
+'
+
+test_expect_success 'rerere and rerere forget' '
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	git rerere &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	git checkout -m fi/le &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	git rerere &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	git add fi/le &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	git rerere forget fi/le &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rerere and rerere forget (subdirectory)' '
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	(cd fi && git rerere) &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	(cd fi && git checkout -m le) &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	(cd fi && git rerere) &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	(cd fi && git add le) &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	(cd fi && git rerere forget le) &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+'
+
 test_done