{"thread":{"id":"24111","subject":"[PATCH] MERGE_RR is in .git, not .git/rr-cache","startedAt":"2010-06-14T22:01:39Z","lastAt":"2010-06-14T22:01:39Z","messageCount":1,"participants":["Jay Soffian"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"143701","messageId":"1276552899-12487-1-git-send-email-jaysoffian@gmail.com","threadId":"24111","inReplyTo":null,"subject":"[PATCH] MERGE_RR is in .git, not .git/rr-cache","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2010-06-14T22:01:39Z","receivedAt":"2010-06-14T22:01:39Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the\nlocation of MERGE_RR but I found a few references to the old\nlocation.\n\nSigned-off-by: Jay Soffian <jaysoffian@gmail.com>\n---\n builtin/rerere.c    |    2 +-\n t/t4151-am-abort.sh |    4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/rerere.c b/builtin/rerere.c\nindex 34f9ace..52507a2 100644\n--- a/builtin/rerere.c\n+++ b/builtin/rerere.c\n@@ -135,7 +135,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)\n \t\t\tif (!has_rerere_resolution(name))\n \t\t\t\tunlink_rr_item(name);\n \t\t}\n-\t\tunlink_or_warn(git_path(\"rr-cache/MERGE_RR\"));\n+\t\tunlink_or_warn(git_path(\"MERGE_RR\"));\n \t} else if (!strcmp(argv[1], \"gc\"))\n \t\tgarbage_collect(&merge_rr);\n \telse if (!strcmp(argv[1], \"status\"))\ndiff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh\nindex 2b912d7..b55c411 100755\n--- a/t/t4151-am-abort.sh\n+++ b/t/t4151-am-abort.sh\n@@ -47,7 +47,7 @@ do\n \t\ttest_must_fail git am$with3 --skip >output &&\n \t\ttest \"$(grep \"^Applying\" output)\" = \"Applying: 6\" &&\n \t\ttest_cmp file-2-expect file-2 &&\n-\t\ttest ! -f .git/rr-cache/MERGE_RR\n+\t\ttest ! -f .git/MERGE_RR\n \t'\n \n \ttest_expect_success \"am --abort goes back after failed am$with3\" '\n@@ -57,7 +57,7 @@ do\n \t\ttest_cmp expect actual &&\n \t\ttest_cmp file-2-expect file-2 &&\n \t\tgit diff-index --exit-code --cached HEAD &&\n-\t\ttest ! -f .git/rr-cache/MERGE_RR\n+\t\ttest ! -f .git/MERGE_RR\n \t'\n \n done\n-- \n1.7.1\n"}]}