Merge commit 'jc/maint' into gfi-maint

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 69b8d26cd13b2fad7b84b9b37e240188aaf085b4..6ba63d7173ba5d333d80c017c4ef5a8c77b90a11 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -35,7 +35,8 @@ git commit -q -a -m first
 
 git checkout -b second master
 git show first:a1 |
-sed -e 's/To die, t/To die! T/' -e 's/life;$/life./' > a1
+sed -e 's/To die, t/To die! T/' > a1
+echo "* END *" >>a1
 git commit -q -a -m second
 
 # activate rerere
@@ -50,10 +51,10 @@ test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
 test_expect_success 'no postimage or thisimage yet' \
        "test ! -f $rr/postimage -a ! -f $rr/thisimage"
 
-test_expect_success 'preimage have right number of lines' '
+test_expect_success 'preimage has right number of lines' '
 
        cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
-       test "$cnt" = 10
+       test $cnt = 9
 
 '
 
@@ -75,15 +76,15 @@ cat > expect << EOF
  For in that sleep of death what dreams may come
  When we have shuffled off this mortal coil,
  Must give us pause: there's the respect
+ That makes calamity of so long life;
 -<<<<<<<
--That makes calamity of so long life.
 -=======
- That makes calamity of so long life;
+-* END *
 ->>>>>>>
 EOF
 git rerere diff > out
 
-test_expect_success 'rerere diff' 'diff -u expect out'
+test_expect_success 'rerere diff' 'git diff expect out'
 
 cat > expect << EOF
 a1
@@ -91,7 +92,7 @@ EOF
 
 git rerere status > out
 
-test_expect_success 'rerere status' 'diff -u expect out'
+test_expect_success 'rerere status' 'git diff expect out'
 
 test_expect_success 'commit succeeds' \
        "git commit -q -a -m 'prefer first over second'"
@@ -107,7 +108,7 @@ test_expect_failure 'another conflicting merge' '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' 'diff -u a1 expect'
+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
@@ -125,39 +126,26 @@ rr2=.git/rr-cache/$sha2
 mkdir $rr2
 echo Hello > $rr2/preimage
 
-case "$(date -d @11111111 +%s 2>/dev/null)" in
-11111111)
-       # 'date' must be able to take arbitrary input with @11111111 notation.
-       # for this test to succeed.  We should fix this part using more
-       # portable script someday.
-
-       now=$(date +%s)
-       almost_15_days_ago=$(($now+60-15*86400))
-       just_over_15_days_ago=$(($now-1-15*86400))
-       almost_60_days_ago=$(($now+60-60*86400))
-       just_over_60_days_ago=$(($now-1-60*86400))
-       predate1="$(date -d "@$almost_60_days_ago" +%Y%m%d%H%M.%S)"
-       predate2="$(date -d "@$almost_15_days_ago" +%Y%m%d%H%M.%S)"
-       postdate1="$(date -d "@$just_over_60_days_ago" +%Y%m%d%H%M.%S)"
-       postdate2="$(date -d "@$just_over_15_days_ago" +%Y%m%d%H%M.%S)"
+almost_15_days_ago=$((60-15*86400))
+just_over_15_days_ago=$((-1-15*86400))
+almost_60_days_ago=$((60-60*86400))
+just_over_60_days_ago=$((-1-60*86400))
 
-       touch -m -t "$predate1" $rr/preimage
-       touch -m -t "$predate2" $rr2/preimage
+test-chmtime =$almost_60_days_ago $rr/preimage
+test-chmtime =$almost_15_days_ago $rr2/preimage
 
-       test_expect_success 'garbage collection (part1)' 'git rerere gc'
+test_expect_success 'garbage collection (part1)' 'git rerere gc'
 
-       test_expect_success 'young records still live' \
-               "test -f $rr/preimage -a -f $rr2/preimage"
+test_expect_success 'young records still live' \
+       "test -f $rr/preimage && test -f $rr2/preimage"
 
-       touch -m -t "$postdate1" $rr/preimage
-       touch -m -t "$postdate2" $rr2/preimage
+test-chmtime =$just_over_60_days_ago $rr/preimage
+test-chmtime =$just_over_15_days_ago $rr2/preimage
 
-       test_expect_success 'garbage collection (part2)' 'git rerere gc'
+test_expect_success 'garbage collection (part2)' 'git rerere gc'
 
-       test_expect_success 'old records rest in peace' \
-               "test ! -f $rr/preimage -a ! -f $rr2/preimage"
-       ;;
-esac
+test_expect_success 'old records rest in peace' \
+       "test ! -f $rr/preimage && test ! -f $rr2/preimage"
 
 test_done