Ignore .gitattributes in bare repositories

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 6f55ba03bd36d25c45224688f29b36e8d7734fe0..85d7e3edcd04be761167ca87cb39a1597908201e 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -101,7 +101,7 @@ cat > expect << EOF
 EOF
 git rerere diff > out
 
-test_expect_success 'rerere diff' 'git diff expect out'
+test_expect_success 'rerere diff' 'test_cmp expect out'
 
 cat > expect << EOF
 a1
@@ -109,26 +109,27 @@ EOF
 
 git rerere status > out
 
-test_expect_success 'rerere status' 'git diff expect out'
+test_expect_success 'rerere status' 'test_cmp expect out'
 
 test_expect_success 'commit succeeds' \
        "git commit -q -a -m 'prefer first over second'"
 
 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"
 
-test_expect_success 'rerere prefers first change' 'git diff a1 expect'
+test_expect_success 'rerere prefers first change' 'test_cmp 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'
 
@@ -164,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