MERGE_RR is in .git, not .git/rr-cache
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jay Soffian committed
Jul 14, 2010 at 13:18 UTC
3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3
2 files changed
+3
-3
builtin/rerere.c
+1
-1
@@ -135,7 +135,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
135
if (!has_rerere_resolution(name))
136
unlink_rr_item(name);
137
}
138
- unlink_or_warn(git_path("rr-cache/MERGE_RR"));
138
+ unlink_or_warn(git_path("MERGE_RR"));
139
} else if (!strcmp(argv[1], "gc"))
140
garbage_collect(&merge_rr);
141
else if (!strcmp(argv[1], "status"))
t/t4151-am-abort.sh
+2
-2
@@ -47,7 +47,7 @@ do
47
test_must_fail git am$with3 --skip >output &&
48
test "$(grep "^Applying" output)" = "Applying: 6" &&
49
test_cmp file-2-expect file-2 &&
50
- test ! -f .git/rr-cache/MERGE_RR
50
+ test ! -f .git/MERGE_RR
51
'
52
53
test_expect_success "am --abort goes back after failed am$with3" '
@@ -57,7 +57,7 @@ do
57
test_cmp expect actual &&
58
test_cmp file-2-expect file-2 &&
59
git diff-index --exit-code --cached HEAD &&
60
- test ! -f .git/rr-cache/MERGE_RR
60
+ test ! -f .git/MERGE_RR
61
'
62
63
done