t / t4200-rerere.shon commit t5541-http-push.sh: add tests for non-fast-forward pushes (1945237)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Johannes E. Schindelin
   4#
   5
   6test_description='git rerere
   7'
   8
   9. ./test-lib.sh
  10
  11cat > a1 << EOF
  12Some title
  13==========
  14Whether 'tis nobler in the mind to suffer
  15The slings and arrows of outrageous fortune,
  16Or to take arms against a sea of troubles,
  17And by opposing end them? To die: to sleep;
  18No more; and by a sleep to say we end
  19The heart-ache and the thousand natural shocks
  20That flesh is heir to, 'tis a consummation
  21Devoutly to be wish'd.
  22EOF
  23
  24git add a1
  25git commit -q -a -m initial
  26
  27git checkout -b first
  28cat >> a1 << EOF
  29Some title
  30==========
  31To die, to sleep;
  32To sleep: perchance to dream: ay, there's the rub;
  33For in that sleep of death what dreams may come
  34When we have shuffled off this mortal coil,
  35Must give us pause: there's the respect
  36That makes calamity of so long life;
  37EOF
  38git commit -q -a -m first
  39
  40git checkout -b second master
  41git show first:a1 |
  42sed -e 's/To die, t/To die! T/' -e 's/Some title/Some Title/' > a1
  43echo "* END *" >>a1
  44git commit -q -a -m second
  45
  46test_expect_success 'nothing recorded without rerere' '
  47        (rm -rf .git/rr-cache; git config rerere.enabled false) &&
  48        test_must_fail git merge first &&
  49        ! test -d .git/rr-cache
  50'
  51
  52# activate rerere, old style
  53test_expect_success 'conflicting merge' '
  54        git reset --hard &&
  55        mkdir .git/rr-cache &&
  56        git config --unset rerere.enabled &&
  57        test_must_fail git merge first
  58'
  59
  60sha1=$(perl -pe 's/     .*//' .git/MERGE_RR)
  61rr=.git/rr-cache/$sha1
  62test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"
  63
  64test_expect_success 'rerere.enabled works, too' '
  65        rm -rf .git/rr-cache &&
  66        git config rerere.enabled true &&
  67        git reset --hard &&
  68        test_must_fail git merge first &&
  69        grep ^=======$ $rr/preimage
  70'
  71
  72test_expect_success 'no postimage or thisimage yet' \
  73        "test ! -f $rr/postimage -a ! -f $rr/thisimage"
  74
  75test_expect_success 'preimage has right number of lines' '
  76
  77        cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
  78        test $cnt = 13
  79
  80'
  81
  82git show first:a1 > a1
  83
  84cat > expect << EOF
  85--- a/a1
  86+++ b/a1
  87@@ -1,4 +1,4 @@
  88-Some Title
  89+Some title
  90 ==========
  91 Whether 'tis nobler in the mind to suffer
  92 The slings and arrows of outrageous fortune,
  93@@ -8,21 +8,11 @@
  94 The heart-ache and the thousand natural shocks
  95 That flesh is heir to, 'tis a consummation
  96 Devoutly to be wish'd.
  97-<<<<<<<
  98-Some Title
  99-==========
 100-To die! To sleep;
 101-=======
 102 Some title
 103 ==========
 104 To die, to sleep;
 105->>>>>>>
 106 To sleep: perchance to dream: ay, there's the rub;
 107 For in that sleep of death what dreams may come
 108 When we have shuffled off this mortal coil,
 109 Must give us pause: there's the respect
 110 That makes calamity of so long life;
 111-<<<<<<<
 112-=======
 113-* END *
 114->>>>>>>
 115EOF
 116git rerere diff > out
 117
 118test_expect_success 'rerere diff' 'test_cmp expect out'
 119
 120cat > expect << EOF
 121a1
 122EOF
 123
 124git rerere status > out
 125
 126test_expect_success 'rerere status' 'test_cmp expect out'
 127
 128test_expect_success 'commit succeeds' \
 129        "git commit -q -a -m 'prefer first over second'"
 130
 131test_expect_success 'recorded postimage' "test -f $rr/postimage"
 132
 133test_expect_success 'another conflicting merge' '
 134        git checkout -b third master &&
 135        git show second^:a1 | sed "s/To die: t/To die! T/" > a1 &&
 136        git commit -q -a -m third &&
 137        test_must_fail git pull . first
 138'
 139
 140git show first:a1 | sed 's/To die: t/To die! T/' > expect
 141test_expect_success 'rerere kicked in' "! grep ^=======$ a1"
 142
 143test_expect_success 'rerere prefers first change' 'test_cmp a1 expect'
 144
 145rm $rr/postimage
 146echo "$sha1     a1" | perl -pe 'y/\012/\000/' > .git/MERGE_RR
 147
 148test_expect_success 'rerere clear' 'git rerere clear'
 149
 150test_expect_success 'clear removed the directory' "test ! -d $rr"
 151
 152mkdir $rr
 153echo Hello > $rr/preimage
 154echo World > $rr/postimage
 155
 156sha2=4000000000000000000000000000000000000000
 157rr2=.git/rr-cache/$sha2
 158mkdir $rr2
 159echo Hello > $rr2/preimage
 160
 161almost_15_days_ago=$((60-15*86400))
 162just_over_15_days_ago=$((-1-15*86400))
 163almost_60_days_ago=$((60-60*86400))
 164just_over_60_days_ago=$((-1-60*86400))
 165
 166test-chmtime =$almost_60_days_ago $rr/preimage
 167test-chmtime =$almost_15_days_ago $rr2/preimage
 168
 169test_expect_success 'garbage collection (part1)' 'git rerere gc'
 170
 171test_expect_success 'young records still live' \
 172        "test -f $rr/preimage && test -f $rr2/preimage"
 173
 174test-chmtime =$just_over_60_days_ago $rr/preimage
 175test-chmtime =$just_over_15_days_ago $rr2/preimage
 176
 177test_expect_success 'garbage collection (part2)' 'git rerere gc'
 178
 179test_expect_success 'old records rest in peace' \
 180        "test ! -f $rr/preimage && test ! -f $rr2/preimage"
 181
 182test_expect_success 'file2 added differently in two branches' '
 183        git reset --hard &&
 184        git checkout -b fourth &&
 185        echo Hallo > file2 &&
 186        git add file2 &&
 187        git commit -m version1 &&
 188        git checkout third &&
 189        echo Bello > file2 &&
 190        git add file2 &&
 191        git commit -m version2 &&
 192        test_must_fail git merge fourth &&
 193        echo Cello > file2 &&
 194        git add file2 &&
 195        git commit -m resolution
 196'
 197
 198test_expect_success 'resolution was recorded properly' '
 199        git reset --hard HEAD~2 &&
 200        git checkout -b fifth &&
 201        echo Hallo > file3 &&
 202        git add file3 &&
 203        git commit -m version1 &&
 204        git checkout third &&
 205        echo Bello > file3 &&
 206        git add file3 &&
 207        git commit -m version2 &&
 208        git tag version2 &&
 209        test_must_fail git merge fifth &&
 210        test Cello = "$(cat file3)" &&
 211        test 0 != $(git ls-files -u | wc -l)
 212'
 213
 214test_expect_success 'rerere.autoupdate' '
 215        git config rerere.autoupdate true
 216        git reset --hard &&
 217        git checkout version2 &&
 218        test_must_fail git merge fifth &&
 219        test 0 = $(git ls-files -u | wc -l)
 220
 221'
 222
 223test_done