summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 19:08:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-15 19:08:36 (GMT)
commit4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch)
treeb449d8155f4148e1afe5c7c9c99553bf85fcab14
parent4cd1b99c32d9a345438d098f37e75077d072778f (diff)
parent3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (diff)
downloadgit-4bd874c8f30d55b6189dacf1d769855ed2df4299.zip
git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.gz
git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.bz2
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache
-rw-r--r--builtin/rerere.c2
-rwxr-xr-xt/t4151-am-abort.sh4
2 files changed, 3 insertions, 3 deletions
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