aboutsummaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2010-07-14 13:18:11 -0400
committerJunio C Hamano <gitster@pobox.com>2010-07-14 13:04:25 -0700
commit3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (patch)
tree5a6087ccd95cf00c8e23e8b325964ef78ca2046d /t/t4151-am-abort.sh
parent1b79d1c2a8a90419238f7213870ab1dc465082fe (diff)
downloadgit-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.tar.gz
git-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.tar.xz
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>
Diffstat (limited to 't/t4151-am-abort.sh')
-rwxr-xr-xt/t4151-am-abort.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 2b912d772..b55c41178 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