[PATCH] MERGE_RR is in .git, not .git/rr-cache

Jay Soffian· Jul 14, 2010, 17:18 UTC · lore

0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the location of MERGE_RR but I found a few references to the old location.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
I thought I'd mailed this out, but apparently not, hence the month old commit date.

 builtin/rerere.c    |    2 +-
 t/t4151-am-abort.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Show changes to 2 files +3 −3

builtin/rerere.c, t/t4151-am-abort.sh

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 980d542..39ad601 100644
--- 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
index 2b912d7..b55c411 100755
--- 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

-- 
1.7.1

Junio C Hamano· Jul 14, 2010, 20:08 UTC · re: Jay Soffian · lore

Re: [PATCH] MERGE_RR is in .git, not .git/rr-cache

Jay Soffian <jaysoffian@gmail.com> writes:

Show 7 quoted lines

> 0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
> location of MERGE_RR but I found a few references to the old
> location.
>
> Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> ---
> I thought I'd mailed this out, but apparently not, hence the month old commit date.

Thanks.

There still are references in contrib/examples/git-rerere.perl and git-reset.sh; they are historical and can be left behind without harm, but we might want to clean them up later.

patchMERGE_RR is in .git, not .git/rr-cache