Merge branch 'js/merge-rr-fix'

gitster · gitster · commit 4bd874c8f30d · 2010-07-15T12:08:36.000-07:00
* js/merge-rr-fix:
  MERGE_RR is in .git, not .git/rr-cache
diff --git a/builtin/rerere.c b/builtin/rerere.c
@@ -135,7 +135,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 			if (!has_rerere_resolution(name))
 				unlink_rr_item(name);
 		}
-		unlink_or_warn(git_path("rr-cache/MERGE_RR"));
+		unlink_or_warn(git_path("MERGE_RR"));
 	} else if (!strcmp(argv[1], "gc"))
 		garbage_collect(&merge_rr);
 	else if (!strcmp(argv[1], "status"))
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
@@ -47,7 +47,7 @@ do
 		test_must_fail git am$with3 --skip >output &&
 		test "$(grep "^Applying" output)" = "Applying: 6" &&
 		test_cmp file-2-expect file-2 &&
-		test ! -f .git/rr-cache/MERGE_RR
+		test ! -f .git/MERGE_RR
 	'
 
 	test_expect_success "am --abort goes back after failed am$with3" '
@@ -57,7 +57,7 @@ do
 		test_cmp expect actual &&
 		test_cmp file-2-expect file-2 &&
 		git diff-index --exit-code --cached HEAD &&
-		test ! -f .git/rr-cache/MERGE_RR
+		test ! -f .git/MERGE_RR
 	'
 
 done

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ int cmd_rerere(int argc, const char *argv, const char prefix)`
`135`	`135`	`if (!has_rerere_resolution(name))`
`136`	`136`	`unlink_rr_item(name);`
`137`	`137`	`}`
`138`		`- unlink_or_warn(git_path("rr-cache/MERGE_RR"));`
	`138`	`+ unlink_or_warn(git_path("MERGE_RR"));`
`139`	`139`	`} else if (!strcmp(argv[1], "gc"))`
`140`	`140`	`garbage_collect(&merge_rr);`
`141`	`141`	`else if (!strcmp(argv[1], "status"))`