t/t4200-rerere.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Johannes E. Schindelin
   4 #
   5
   6 test_description='git rerere
   7 '
   8
   9 . ./test-lib.sh
  10
  11 cat > a1 << EOF
  12 Whether 'tis nobler in the mind to suffer
  13 The slings and arrows of outrageous fortune,
  14 Or to take arms against a sea of troubles,
  15 And by opposing end them? To die: to sleep;
  16 No more; and by a sleep to say we end
  17 The heart-ache and the thousand natural shocks
  18 That flesh is heir to, 'tis a consummation
  19 Devoutly to be wish'd.
  20 EOF
  21
  22 git add a1
  23 git commit -q -a -m initial
  24
  25 git checkout -b first
  26 cat >> a1 << EOF
  27 To die, to sleep;
  28 To sleep: perchance to dream: ay, there's the rub;
  29 For in that sleep of death what dreams may come
  30 When we have shuffled off this mortal coil,
  31 Must give us pause: there's the respect
  32 That makes calamity of so long life;
  33 EOF
  34 git commit -q -a -m first
  35
  36 git checkout -b second master
  37 git show first:a1 |
  38 sed -e 's/To die, t/To die! T/' > a1
  39 echo "* END *" >>a1
  40 git commit -q -a -m second
  41
  42 # activate rerere
  43 mkdir .git/rr-cache
  44
  45 test_expect_failure 'conflicting merge' 'git pull . first'
  46
  47 sha1=$(sed -e 's/       .*//' .git/rr-cache/MERGE_RR)
  48 rr=.git/rr-cache/$sha1
  49 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
  50
  51 test_expect_success 'no postimage or thisimage yet' \
  52         "test ! -f $rr/postimage -a ! -f $rr/thisimage"
  53
  54 test_expect_success 'preimage has right number of lines' '
  55
  56         cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
  57         test $cnt = 9
  58
  59 '
  60
  61 git show first:a1 > a1
  62
  63 cat > expect << EOF
  64 --- a/a1
  65 +++ b/a1
  66 @@ -6,17 +6,9 @@
  67  The heart-ache and the thousand natural shocks
  68  That flesh is heir to, 'tis a consummation
  69  Devoutly to be wish'd.
  70 -<<<<<<<
  71 -To die! To sleep;
  72 -=======
  73  To die, to sleep;
  74 ->>>>>>>
  75  To sleep: perchance to dream: ay, there's the rub;
  76  For in that sleep of death what dreams may come
  77  When we have shuffled off this mortal coil,
  78  Must give us pause: there's the respect
  79  That makes calamity of so long life;
  80 -<<<<<<<
  81 -=======
  82 -* END *
  83 ->>>>>>>
  84 EOF
  85 git rerere diff > out
  86
  87 test_expect_success 'rerere diff' 'git diff expect out'
  88
  89 cat > expect << EOF
  90 a1
  91 EOF
  92
  93 git rerere status > out
  94
  95 test_expect_success 'rerere status' 'git diff expect out'
  96
  97 test_expect_success 'commit succeeds' \
  98         "git commit -q -a -m 'prefer first over second'"
  99
 100 test_expect_success 'recorded postimage' "test -f $rr/postimage"
 101
 102 git checkout -b third master
 103 git show second^:a1 | sed 's/To die: t/To die! T/' > a1
 104 git commit -q -a -m third
 105
 106 test_expect_failure 'another conflicting merge' 'git pull . first'
 107
 108 git show first:a1 | sed 's/To die: t/To die! T/' > expect
 109 test_expect_success 'rerere kicked in' "! grep ======= a1"
 110
 111 test_expect_success 'rerere prefers first change' 'git diff a1 expect'
 112
 113 rm $rr/postimage
 114 echo "$sha1     a1" | tr '\012' '\0' > .git/rr-cache/MERGE_RR
 115
 116 test_expect_success 'rerere clear' 'git rerere clear'
 117
 118 test_expect_success 'clear removed the directory' "test ! -d $rr"
 119
 120 mkdir $rr
 121 echo Hello > $rr/preimage
 122 echo World > $rr/postimage
 123
 124 sha2=4000000000000000000000000000000000000000
 125 rr2=.git/rr-cache/$sha2
 126 mkdir $rr2
 127 echo Hello > $rr2/preimage
 128
 129 almost_15_days_ago=$((60-15*86400))
 130 just_over_15_days_ago=$((-1-15*86400))
 131 almost_60_days_ago=$((60-60*86400))
 132 just_over_60_days_ago=$((-1-60*86400))
 133
 134 test-chmtime =$almost_60_days_ago $rr/preimage
 135 test-chmtime =$almost_15_days_ago $rr2/preimage
 136
 137 test_expect_success 'garbage collection (part1)' 'git rerere gc'
 138
 139 test_expect_success 'young records still live' \
 140         "test -f $rr/preimage && test -f $rr2/preimage"
 141
 142 test-chmtime =$just_over_60_days_ago $rr/preimage
 143 test-chmtime =$just_over_15_days_ago $rr2/preimage
 144
 145 test_expect_success 'garbage collection (part2)' 'git rerere gc'
 146
 147 test_expect_success 'old records rest in peace' \
 148         "test ! -f $rr/preimage && test ! -f $rr2/preimage"
 149
 150 test_done