Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Johannes E. Schindelin
   4#
   5
   6test_description='git rerere
   7
   8! [fifth] version1
   9 ! [first] first
  10  ! [fourth] version1
  11   ! [master] initial
  12    ! [second] prefer first over second
  13     ! [third] version2
  14------
  15     + [third] version2
  16+      [fifth] version1
  17  +    [fourth] version1
  18+ +  + [third^] third
  19    -  [second] prefer first over second
  20 +  +  [first] first
  21    +  [second^] second
  22++++++ [master] initial
  23'
  24
  25. ./test-lib.sh
  26
  27test_expect_success 'setup' '
  28        cat >a1 <<-\EOF &&
  29        Some title
  30        ==========
  31        Whether '\''tis nobler in the mind to suffer
  32        The slings and arrows of outrageous fortune,
  33        Or to take arms against a sea of troubles,
  34        And by opposing end them? To die: to sleep;
  35        No more; and by a sleep to say we end
  36        The heart-ache and the thousand natural shocks
  37        That flesh is heir to, '\''tis a consummation
  38        Devoutly to be wish'\''d.
  39        EOF
  40
  41        git add a1 &&
  42        test_tick &&
  43        git commit -q -a -m initial &&
  44
  45        cat >>a1 <<-\EOF &&
  46        Some title
  47        ==========
  48        To die, to sleep;
  49        To sleep: perchance to dream: ay, there'\''s the rub;
  50        For in that sleep of death what dreams may come
  51        When we have shuffled off this mortal coil,
  52        Must give us pause: there'\''s the respect
  53        That makes calamity of so long life;
  54        EOF
  55
  56        git checkout -b first &&
  57        test_tick &&
  58        git commit -q -a -m first &&
  59
  60        git checkout -b second master &&
  61        git show first:a1 |
  62        sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
  63        echo "* END *" >>a1 &&
  64        test_tick &&
  65        git commit -q -a -m second
  66'
  67
  68test_expect_success 'nothing recorded without rerere' '
  69        rm -rf .git/rr-cache &&
  70        git config rerere.enabled false &&
  71        test_must_fail git merge first &&
  72        ! test -d .git/rr-cache
  73'
  74
  75test_expect_success 'activate rerere, old style (conflicting merge)' '
  76        git reset --hard &&
  77        mkdir .git/rr-cache &&
  78        test_might_fail git config --unset rerere.enabled &&
  79        test_must_fail git merge first &&
  80
  81        sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
  82        rr=.git/rr-cache/$sha1 &&
  83        grep "^=======\$" $rr/preimage &&
  84        ! test -f $rr/postimage &&
  85        ! test -f $rr/thisimage
  86'
  87
  88test_expect_success 'rerere.enabled works, too' '
  89        rm -rf .git/rr-cache &&
  90        git config rerere.enabled true &&
  91        git reset --hard &&
  92        test_must_fail git merge first &&
  93
  94        sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
  95        rr=.git/rr-cache/$sha1 &&
  96        grep ^=======$ $rr/preimage
  97'
  98
  99test_expect_success 'set up rr-cache' '
 100        rm -rf .git/rr-cache &&
 101        git config rerere.enabled true &&
 102        git reset --hard &&
 103        test_must_fail git merge first &&
 104        sha1=$(perl -pe "s/     .*//" .git/MERGE_RR) &&
 105        rr=.git/rr-cache/$sha1
 106'
 107
 108test_expect_success 'rr-cache looks sane' '
 109        # no postimage or thisimage yet
 110        ! test -f $rr/postimage &&
 111        ! test -f $rr/thisimage &&
 112
 113        # preimage has right number of lines
 114        cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
 115        echo $cnt &&
 116        test $cnt = 13
 117'
 118
 119test_expect_success 'rerere diff' '
 120        git show first:a1 >a1 &&
 121        cat >expect <<-\EOF &&
 122        --- a/a1
 123        +++ b/a1
 124        @@ -1,4 +1,4 @@
 125        -Some Title
 126        +Some title
 127         ==========
 128         Whether '\''tis nobler in the mind to suffer
 129         The slings and arrows of outrageous fortune,
 130        @@ -8,21 +8,11 @@
 131         The heart-ache and the thousand natural shocks
 132         That flesh is heir to, '\''tis a consummation
 133         Devoutly to be wish'\''d.
 134        -<<<<<<<
 135        -Some Title
 136        -==========
 137        -To die! To sleep;
 138        -=======
 139         Some title
 140         ==========
 141         To die, to sleep;
 142        ->>>>>>>
 143         To sleep: perchance to dream: ay, there'\''s the rub;
 144         For in that sleep of death what dreams may come
 145         When we have shuffled off this mortal coil,
 146         Must give us pause: there'\''s the respect
 147         That makes calamity of so long life;
 148        -<<<<<<<
 149        -=======
 150        -* END *
 151        ->>>>>>>
 152        EOF
 153        git rerere diff >out &&
 154        test_cmp expect out
 155'
 156
 157test_expect_success 'rerere status' '
 158        echo a1 >expect &&
 159        git rerere status >out &&
 160        test_cmp expect out
 161'
 162
 163test_expect_success 'first postimage wins' '
 164        git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
 165
 166        git commit -q -a -m "prefer first over second" &&
 167        test -f $rr/postimage &&
 168
 169        oldmtimepost=$(test-chmtime -v -60 $rr/postimage | cut -f 1) &&
 170
 171        git checkout -b third master &&
 172        git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
 173        git commit -q -a -m third &&
 174
 175        test_must_fail git merge first &&
 176        # rerere kicked in
 177        ! grep "^=======\$" a1 &&
 178        test_cmp expect a1
 179'
 180
 181test_expect_success 'rerere updates postimage timestamp' '
 182        newmtimepost=$(test-chmtime -v +0 $rr/postimage | cut -f 1) &&
 183        test $oldmtimepost -lt $newmtimepost
 184'
 185
 186test_expect_success 'rerere clear' '
 187        mv $rr/postimage .git/post-saved &&
 188        echo "$sha1     a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
 189        git rerere clear &&
 190        ! test -d $rr
 191'
 192
 193test_expect_success 'leftover directory' '
 194        git reset --hard &&
 195        mkdir -p $rr &&
 196        test_must_fail git merge first &&
 197        test -f $rr/preimage
 198'
 199
 200test_expect_success 'missing preimage' '
 201        git reset --hard &&
 202        mkdir -p $rr &&
 203        cp .git/post-saved $rr/postimage &&
 204        test_must_fail git merge first &&
 205        test -f $rr/preimage
 206'
 207
 208test_expect_success 'set up for garbage collection tests' '
 209        mkdir -p $rr &&
 210        echo Hello >$rr/preimage &&
 211        echo World >$rr/postimage &&
 212
 213        sha2=4000000000000000000000000000000000000000 &&
 214        rr2=.git/rr-cache/$sha2 &&
 215        mkdir $rr2 &&
 216        echo Hello >$rr2/preimage &&
 217
 218        almost_15_days_ago=$((60-15*86400)) &&
 219        just_over_15_days_ago=$((-1-15*86400)) &&
 220        almost_60_days_ago=$((60-60*86400)) &&
 221        just_over_60_days_ago=$((-1-60*86400)) &&
 222
 223        test-chmtime =$just_over_60_days_ago $rr/preimage &&
 224        test-chmtime =$almost_60_days_ago $rr/postimage &&
 225        test-chmtime =$almost_15_days_ago $rr2/preimage
 226'
 227
 228test_expect_success 'gc preserves young or recently used records' '
 229        git rerere gc &&
 230        test -f $rr/preimage &&
 231        test -f $rr2/preimage
 232'
 233
 234test_expect_success 'old records rest in peace' '
 235        test-chmtime =$just_over_60_days_ago $rr/postimage &&
 236        test-chmtime =$just_over_15_days_ago $rr2/preimage &&
 237        git rerere gc &&
 238        ! test -f $rr/preimage &&
 239        ! test -f $rr2/preimage
 240'
 241
 242test_expect_success 'rerere gc with custom expiry' '
 243        rm -fr .git/rr-cache &&
 244        rr=.git/rr-cache/$_z40 &&
 245        mkdir -p "$rr" &&
 246        >"$rr/preimage" &&
 247        >"$rr/postimage" &&
 248
 249        two_days_ago=$((-2*86400)) &&
 250        test-chmtime =$two_days_ago "$rr/preimage" &&
 251        test-chmtime =$two_days_ago "$rr/postimage" &&
 252
 253        find .git/rr-cache -type f | sort >original &&
 254
 255        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 256        find .git/rr-cache -type f | sort >actual &&
 257        test_cmp original actual &&
 258
 259        git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
 260        find .git/rr-cache -type f | sort >actual &&
 261        test_cmp original actual &&
 262
 263        git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
 264        find .git/rr-cache -type f | sort >actual &&
 265        >expect &&
 266        test_cmp expect actual
 267'
 268
 269test_expect_success 'setup: file2 added differently in two branches' '
 270        git reset --hard &&
 271
 272        git checkout -b fourth &&
 273        echo Hallo >file2 &&
 274        git add file2 &&
 275        test_tick &&
 276        git commit -m version1 &&
 277
 278        git checkout third &&
 279        echo Bello >file2 &&
 280        git add file2 &&
 281        test_tick &&
 282        git commit -m version2 &&
 283
 284        test_must_fail git merge fourth &&
 285        echo Cello >file2 &&
 286        git add file2 &&
 287        git commit -m resolution
 288'
 289
 290test_expect_success 'resolution was recorded properly' '
 291        echo Cello >expected &&
 292
 293        git reset --hard HEAD~2 &&
 294        git checkout -b fifth &&
 295
 296        echo Hallo >file3 &&
 297        git add file3 &&
 298        test_tick &&
 299        git commit -m version1 &&
 300
 301        git checkout third &&
 302        echo Bello >file3 &&
 303        git add file3 &&
 304        test_tick &&
 305        git commit -m version2 &&
 306        git tag version2 &&
 307
 308        test_must_fail git merge fifth &&
 309        test_cmp expected file3 &&
 310        test_must_fail git update-index --refresh
 311'
 312
 313test_expect_success 'rerere.autoupdate' '
 314        git config rerere.autoupdate true &&
 315        git reset --hard &&
 316        git checkout version2 &&
 317        test_must_fail git merge fifth &&
 318        git update-index --refresh
 319'
 320
 321test_expect_success 'merge --rerere-autoupdate' '
 322        test_might_fail git config --unset rerere.autoupdate &&
 323        git reset --hard &&
 324        git checkout version2 &&
 325        test_must_fail git merge --rerere-autoupdate fifth &&
 326        git update-index --refresh
 327'
 328
 329test_expect_success 'merge --no-rerere-autoupdate' '
 330        headblob=$(git rev-parse version2:file3) &&
 331        mergeblob=$(git rev-parse fifth:file3) &&
 332        cat >expected <<-EOF &&
 333        100644 $headblob 2      file3
 334        100644 $mergeblob 3     file3
 335        EOF
 336
 337        git config rerere.autoupdate true &&
 338        git reset --hard &&
 339        git checkout version2 &&
 340        test_must_fail git merge --no-rerere-autoupdate fifth &&
 341        git ls-files -u >actual &&
 342        test_cmp expected actual
 343'
 344
 345test_expect_success 'set up an unresolved merge' '
 346        headblob=$(git rev-parse version2:file3) &&
 347        mergeblob=$(git rev-parse fifth:file3) &&
 348        cat >expected.unresolved <<-EOF &&
 349        100644 $headblob 2      file3
 350        100644 $mergeblob 3     file3
 351        EOF
 352
 353        test_might_fail git config --unset rerere.autoupdate &&
 354        git reset --hard &&
 355        git checkout version2 &&
 356        fifth=$(git rev-parse fifth) &&
 357        echo "$fifth            branch 'fifth' of ." |
 358        git fmt-merge-msg >msg &&
 359        ancestor=$(git merge-base version2 fifth) &&
 360        test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
 361
 362        git ls-files --stage >failedmerge &&
 363        cp file3 file3.conflict &&
 364
 365        git ls-files -u >actual &&
 366        test_cmp expected.unresolved actual
 367'
 368
 369test_expect_success 'explicit rerere' '
 370        test_might_fail git config --unset rerere.autoupdate &&
 371        git rm -fr --cached . &&
 372        git update-index --index-info <failedmerge &&
 373        cp file3.conflict file3 &&
 374        test_must_fail git update-index --refresh -q &&
 375
 376        git rerere &&
 377        git ls-files -u >actual &&
 378        test_cmp expected.unresolved actual
 379'
 380
 381test_expect_success 'explicit rerere with autoupdate' '
 382        git config rerere.autoupdate true &&
 383        git rm -fr --cached . &&
 384        git update-index --index-info <failedmerge &&
 385        cp file3.conflict file3 &&
 386        test_must_fail git update-index --refresh -q &&
 387
 388        git rerere &&
 389        git update-index --refresh
 390'
 391
 392test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
 393        git config rerere.autoupdate false &&
 394        git rm -fr --cached . &&
 395        git update-index --index-info <failedmerge &&
 396        cp file3.conflict file3 &&
 397        git rerere &&
 398        git ls-files -u >actual1 &&
 399
 400        git rm -fr --cached . &&
 401        git update-index --index-info <failedmerge &&
 402        cp file3.conflict file3 &&
 403        git rerere --rerere-autoupdate &&
 404        git update-index --refresh &&
 405
 406        git rm -fr --cached . &&
 407        git update-index --index-info <failedmerge &&
 408        cp file3.conflict file3 &&
 409        git rerere --rerere-autoupdate --no-rerere-autoupdate &&
 410        git ls-files -u >actual2 &&
 411
 412        git rm -fr --cached . &&
 413        git update-index --index-info <failedmerge &&
 414        cp file3.conflict file3 &&
 415        git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
 416        git update-index --refresh &&
 417
 418        test_cmp expected.unresolved actual1 &&
 419        test_cmp expected.unresolved actual2
 420'
 421
 422test_expect_success 'rerere --no-no-rerere-autoupdate' '
 423        git rm -fr --cached . &&
 424        git update-index --index-info <failedmerge &&
 425        cp file3.conflict file3 &&
 426        test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
 427        test_i18ngrep [Uu]sage err &&
 428        test_must_fail git update-index --refresh
 429'
 430
 431test_expect_success 'rerere -h' '
 432        test_must_fail git rerere -h >help &&
 433        test_i18ngrep [Uu]sage help
 434'
 435
 436concat_insert () {
 437        last=$1
 438        shift
 439        cat early && printf "%s\n" "$@" && cat late "$last"
 440}
 441
 442count_pre_post () {
 443        find .git/rr-cache/ -type f -name "preimage*" >actual &&
 444        test_line_count = "$1" actual &&
 445        find .git/rr-cache/ -type f -name "postimage*" >actual &&
 446        test_line_count = "$2" actual
 447}
 448
 449merge_conflict_resolve () {
 450        git reset --hard &&
 451        test_must_fail git merge six.1 &&
 452        # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
 453        concat_insert short 6.1 6.2 >file1 &&
 454        concat_insert long 6.1 6.2 >file2
 455}
 456
 457test_expect_success 'multiple identical conflicts' '
 458        rm -fr .git/rr-cache &&
 459        mkdir .git/rr-cache &&
 460        git reset --hard &&
 461
 462        test_seq 1 6 >early &&
 463        >late &&
 464        test_seq 11 15 >short &&
 465        test_seq 111 120 >long &&
 466        concat_insert short >file1 &&
 467        concat_insert long >file2 &&
 468        git add file1 file2 &&
 469        git commit -m base &&
 470        git tag base &&
 471        git checkout -b six.1 &&
 472        concat_insert short 6.1 >file1 &&
 473        concat_insert long 6.1 >file2 &&
 474        git add file1 file2 &&
 475        git commit -m 6.1 &&
 476        git checkout -b six.2 HEAD^ &&
 477        concat_insert short 6.2 >file1 &&
 478        concat_insert long 6.2 >file2 &&
 479        git add file1 file2 &&
 480        git commit -m 6.2 &&
 481
 482        # At this point, six.1 and six.2
 483        # - derive from common ancestor that has two files
 484        #   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
 485        # - six.1 replaces these 7s with 6.1
 486        # - six.2 replaces these 7s with 6.2
 487
 488        merge_conflict_resolve &&
 489
 490        # Check that rerere knows that file1 and file2 have conflicts
 491
 492        printf "%s\n" file1 file2 >expect &&
 493        git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
 494        test_cmp expect actual &&
 495
 496        git rerere status | sort >actual &&
 497        test_cmp expect actual &&
 498
 499        git rerere remaining >actual &&
 500        test_cmp expect actual &&
 501
 502        count_pre_post 2 0 &&
 503
 504        # Pretend that the conflicts were made quite some time ago
 505        find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
 506
 507        # Unresolved entries have not expired yet
 508        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 509        count_pre_post 2 0 &&
 510
 511        # Unresolved entries have expired
 512        git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
 513        count_pre_post 0 0 &&
 514
 515        # Recreate the conflicted state
 516        merge_conflict_resolve &&
 517        count_pre_post 2 0 &&
 518
 519        # Clear it
 520        git rerere clear &&
 521        count_pre_post 0 0 &&
 522
 523        # Recreate the conflicted state
 524        merge_conflict_resolve &&
 525        count_pre_post 2 0 &&
 526
 527        # We resolved file1 and file2
 528        git rerere &&
 529        >expect &&
 530        git rerere remaining >actual &&
 531        test_cmp expect actual &&
 532
 533        # We must have recorded both of them
 534        count_pre_post 2 2 &&
 535
 536        # Now we should be able to resolve them both
 537        git reset --hard &&
 538        test_must_fail git merge six.1 &&
 539        git rerere &&
 540
 541        >expect &&
 542        git rerere remaining >actual &&
 543        test_cmp expect actual &&
 544
 545        concat_insert short 6.1 6.2 >file1.expect &&
 546        concat_insert long 6.1 6.2 >file2.expect &&
 547        test_cmp file1.expect file1 &&
 548        test_cmp file2.expect file2 &&
 549
 550        # Forget resolution for file2
 551        git rerere forget file2 &&
 552        echo file2 >expect &&
 553        git rerere status >actual &&
 554        test_cmp expect actual &&
 555        count_pre_post 2 1 &&
 556
 557        # file2 already has correct resolution, so record it again
 558        git rerere &&
 559
 560        # Pretend that the resolutions are old again
 561        find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
 562
 563        # Resolved entries have not expired yet
 564        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 565
 566        count_pre_post 2 2 &&
 567
 568        # Resolved entries have expired
 569        git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
 570        count_pre_post 0 0
 571'
 572
 573test_done