diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:48:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:56:27 -0700 |
| commit | ebcffb1d44643bab69671abdf79209489e64dbef (patch) | |
| tree | d451abfc0dad9e9f3c45eb3cdc247d1dc3f81710 /t | |
| parent | Merge branch 'sb/rerere-lib' (diff) | |
| parent | Move MERGE_RR from .git/rr-cache/ into .git/ (diff) | |
| download | tgif-ebcffb1d44643bab69671abdf79209489e64dbef.tar.xz | |
Merge branch 'js/merge-rr'
* js/merge-rr:
Move MERGE_RR from .git/rr-cache/ into .git/
Conflicts:
builtin-rerere.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4200-rerere.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index cf10557dd2..b5a4202998 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' ' ! git merge first ' -sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR) +sha1=$(sed -e 's/ .*//' .git/MERGE_RR) rr=.git/rr-cache/$sha1 test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage" @@ -143,7 +143,7 @@ test_expect_success 'rerere kicked in' "! grep ^=======$ a1" test_expect_success 'rerere prefers first change' 'test_cmp a1 expect' rm $rr/postimage -echo "$sha1 a1" | perl -pe 'y/\012/\000/' > .git/rr-cache/MERGE_RR +echo "$sha1 a1" | perl -pe 'y/\012/\000/' > .git/MERGE_RR test_expect_success 'rerere clear' 'git rerere clear' @@ -190,7 +190,7 @@ test_expect_success 'file2 added differently in two branches' ' git add file2 && git commit -m version2 && ! git merge fourth && - sha1=$(sed -e "s/ .*//" .git/rr-cache/MERGE_RR) && + sha1=$(sed -e "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 && echo Cello > file2 && git add file2 && |