Merge 1.5.0.7 in
[git/spearce.git] / t / t4200-rerere.sh
blob8b611bbea210551d86016b53718ba1af313f1353
1 #!/bin/sh
3 # Copyright (c) 2006 Johannes E. Schindelin
6 test_description='git-rerere
9 . ./test-lib.sh
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
22 git add a1
23 git commit -q -a -m initial
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
36 git checkout -b second master
37 git show first:a1 |
38 sed -e 's/To die, t/To die! T/' -e 's/life;$/life./' > a1
39 git commit -q -a -m second
41 # activate rerere
42 mkdir .git/rr-cache
44 test_expect_failure 'conflicting merge' 'git pull . first'
46 sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
47 rr=.git/rr-cache/$sha1
48 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
50 test_expect_success 'no postimage or thisimage yet' \
51 "test ! -f $rr/postimage -a ! -f $rr/thisimage"
53 test_expect_success 'preimage have right number of lines' '
55 cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
56 test "$cnt" = 10
60 git show first:a1 > a1
62 cat > expect << EOF
63 --- a/a1
64 +++ b/a1
65 @@ -6,17 +6,9 @@
66 The heart-ache and the thousand natural shocks
67 That flesh is heir to, 'tis a consummation
68 Devoutly to be wish'd.
69 -<<<<<<<
70 -To die! To sleep;
71 -=======
72 To die, to sleep;
73 ->>>>>>>
74 To sleep: perchance to dream: ay, there's the rub;
75 For in that sleep of death what dreams may come
76 When we have shuffled off this mortal coil,
77 Must give us pause: there's the respect
78 -<<<<<<<
79 -That makes calamity of so long life.
80 -=======
81 That makes calamity of so long life;
82 ->>>>>>>
83 EOF
84 git rerere diff > out
86 test_expect_success 'rerere diff' 'git diff expect out'
88 cat > expect << EOF
90 EOF
92 git rerere status > out
94 test_expect_success 'rerere status' 'git diff expect out'
96 test_expect_success 'commit succeeds' \
97 "git commit -q -a -m 'prefer first over second'"
99 test_expect_success 'recorded postimage' "test -f $rr/postimage"
101 git checkout -b third master
102 git show second^:a1 | sed 's/To die: t/To die! T/' > a1
103 git commit -q -a -m third
105 test_expect_failure 'another conflicting merge' 'git pull . first'
107 git show first:a1 | sed 's/To die: t/To die! T/' > expect
108 test_expect_success 'rerere kicked in' "! grep ======= a1"
110 test_expect_success 'rerere prefers first change' 'git diff a1 expect'
112 rm $rr/postimage
113 echo "$sha1 a1" | tr '\012' '\0' > .git/rr-cache/MERGE_RR
115 test_expect_success 'rerere clear' 'git rerere clear'
117 test_expect_success 'clear removed the directory' "test ! -d $rr"
119 mkdir $rr
120 echo Hello > $rr/preimage
121 echo World > $rr/postimage
123 sha2=4000000000000000000000000000000000000000
124 rr2=.git/rr-cache/$sha2
125 mkdir $rr2
126 echo Hello > $rr2/preimage
128 almost_15_days_ago=$((60-15*86400))
129 just_over_15_days_ago=$((-1-15*86400))
130 almost_60_days_ago=$((60-60*86400))
131 just_over_60_days_ago=$((-1-60*86400))
133 test-chmtime =$almost_60_days_ago $rr/preimage
134 test-chmtime =$almost_15_days_ago $rr2/preimage
136 test_expect_success 'garbage collection (part1)' 'git rerere gc'
138 test_expect_success 'young records still live' \
139 "test -f $rr/preimage && test -f $rr2/preimage"
141 test-chmtime =$just_over_60_days_ago $rr/preimage
142 test-chmtime =$just_over_15_days_ago $rr2/preimage
144 test_expect_success 'garbage collection (part2)' 'git rerere gc'
146 test_expect_success 'old records rest in peace' \
147 "test ! -f $rr/preimage && test ! -f $rr2/preimage"
149 test_done