Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix: MERGE_RR is in .git, not .git/rr-cache
This commit is contained in:
commit
4bd874c8f3
@ -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"))
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user