fix bsd shell negation

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 71d364ab79f5ec971a4d8b26422a3ea78e5f55da..3cbfee704e6238eb31fa1b519567fb064ca27ad8 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -39,15 +39,32 @@ sed -e 's/To die, t/To die! T/' > a1
 echo "* END *" >>a1
 git commit -q -a -m second
 
-# activate rerere
-mkdir .git/rr-cache
+test_expect_success 'nothing recorded without rerere' '
+       (rm -rf .git/rr-cache; git config rerere.enabled false) &&
+       ! git merge first &&
+       ! test -d .git/rr-cache
+'
 
-test_expect_failure 'conflicting merge' 'git pull . first'
+# activate rerere, old style
+test_expect_success 'conflicting merge' '
+       git reset --hard &&
+       mkdir .git/rr-cache &&
+       git config --unset rerere.enabled &&
+       ! git merge first
+'
 
 sha1=$(sed -e 's/      .*//' .git/rr-cache/MERGE_RR)
 rr=.git/rr-cache/$sha1
 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
 
+test_expect_success 'rerere.enabled works, too' '
+       rm -rf .git/rr-cache &&
+       git config rerere.enabled true &&
+       git reset --hard &&
+       ! git merge first &&
+       grep ======= $rr/preimage
+'
+
 test_expect_success 'no postimage or thisimage yet' \
        "test ! -f $rr/postimage -a ! -f $rr/thisimage"
 
@@ -99,11 +116,12 @@ test_expect_success 'commit succeeds' \
 
 test_expect_success 'recorded postimage' "test -f $rr/postimage"
 
-git checkout -b third master
-git show second^:a1 | sed 's/To die: t/To die! T/' > a1
-git commit -q -a -m third
-
-test_expect_failure 'another conflicting merge' 'git pull . first'
+test_expect_success 'another conflicting merge' '
+       git checkout -b third master &&
+       git show second^:a1 | sed "s/To die: t/To die! T/" > a1 &&
+       git commit -q -a -m third &&
+       ! git pull . first
+'
 
 git show first:a1 | sed 's/To die: t/To die! T/' > expect
 test_expect_success 'rerere kicked in' "! grep ======= a1"
@@ -111,7 +129,7 @@ test_expect_success 'rerere kicked in' "! grep ======= a1"
 test_expect_success 'rerere prefers first change' 'git diff a1 expect'
 
 rm $rr/postimage
-echo "$sha1    a1" | tr '\012' '\0' > .git/rr-cache/MERGE_RR
+echo "$sha1    a1" | perl -pe 'y/\012/\000/' > .git/rr-cache/MERGE_RR
 
 test_expect_success 'rerere clear' 'git rerere clear'
 
@@ -147,4 +165,37 @@ test_expect_success 'garbage collection (part2)' 'git rerere gc'
 test_expect_success 'old records rest in peace' \
        "test ! -f $rr/preimage && test ! -f $rr2/preimage"
 
+test_expect_success 'file2 added differently in two branches' '
+       git reset --hard &&
+       git checkout -b fourth &&
+       echo Hallo > file2 &&
+       git add file2 &&
+       git commit -m version1 &&
+       git checkout third &&
+       echo Bello > file2 &&
+       git add file2 &&
+       git commit -m version2 &&
+       ! git merge fourth &&
+       sha1=$(sed -e "s/       .*//" .git/rr-cache/MERGE_RR) &&
+       rr=.git/rr-cache/$sha1 &&
+       echo Cello > file2 &&
+       git add file2 &&
+       git commit -m resolution
+'
+
+test_expect_success 'resolution was recorded properly' '
+       git reset --hard HEAD~2 &&
+       git checkout -b fifth &&
+       echo Hallo > file3 &&
+       git add file3 &&
+       git commit -m version1 &&
+       git checkout third &&
+       echo Bello > file3 &&
+       git add file3 &&
+       git commit -m version2 &&
+       ! git merge fifth &&
+       git diff-files -q &&
+       test Cello = "$(cat file3)"
+'
+
 test_done