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 'setup: file2 added differently in two branches' '
 243        git reset --hard &&
 244
 245        git checkout -b fourth &&
 246        echo Hallo >file2 &&
 247        git add file2 &&
 248        test_tick &&
 249        git commit -m version1 &&
 250
 251        git checkout third &&
 252        echo Bello >file2 &&
 253        git add file2 &&
 254        test_tick &&
 255        git commit -m version2 &&
 256
 257        test_must_fail git merge fourth &&
 258        echo Cello >file2 &&
 259        git add file2 &&
 260        git commit -m resolution
 261'
 262
 263test_expect_success 'resolution was recorded properly' '
 264        echo Cello >expected &&
 265
 266        git reset --hard HEAD~2 &&
 267        git checkout -b fifth &&
 268
 269        echo Hallo >file3 &&
 270        git add file3 &&
 271        test_tick &&
 272        git commit -m version1 &&
 273
 274        git checkout third &&
 275        echo Bello >file3 &&
 276        git add file3 &&
 277        test_tick &&
 278        git commit -m version2 &&
 279        git tag version2 &&
 280
 281        test_must_fail git merge fifth &&
 282        test_cmp expected file3 &&
 283        test_must_fail git update-index --refresh
 284'
 285
 286test_expect_success 'rerere.autoupdate' '
 287        git config rerere.autoupdate true &&
 288        git reset --hard &&
 289        git checkout version2 &&
 290        test_must_fail git merge fifth &&
 291        git update-index --refresh
 292'
 293
 294test_expect_success 'merge --rerere-autoupdate' '
 295        test_might_fail git config --unset rerere.autoupdate &&
 296        git reset --hard &&
 297        git checkout version2 &&
 298        test_must_fail git merge --rerere-autoupdate fifth &&
 299        git update-index --refresh
 300'
 301
 302test_expect_success 'merge --no-rerere-autoupdate' '
 303        headblob=$(git rev-parse version2:file3) &&
 304        mergeblob=$(git rev-parse fifth:file3) &&
 305        cat >expected <<-EOF &&
 306        100644 $headblob 2      file3
 307        100644 $mergeblob 3     file3
 308        EOF
 309
 310        git config rerere.autoupdate true &&
 311        git reset --hard &&
 312        git checkout version2 &&
 313        test_must_fail git merge --no-rerere-autoupdate fifth &&
 314        git ls-files -u >actual &&
 315        test_cmp expected actual
 316'
 317
 318test_expect_success 'set up an unresolved merge' '
 319        headblob=$(git rev-parse version2:file3) &&
 320        mergeblob=$(git rev-parse fifth:file3) &&
 321        cat >expected.unresolved <<-EOF &&
 322        100644 $headblob 2      file3
 323        100644 $mergeblob 3     file3
 324        EOF
 325
 326        test_might_fail git config --unset rerere.autoupdate &&
 327        git reset --hard &&
 328        git checkout version2 &&
 329        fifth=$(git rev-parse fifth) &&
 330        echo "$fifth            branch 'fifth' of ." |
 331        git fmt-merge-msg >msg &&
 332        ancestor=$(git merge-base version2 fifth) &&
 333        test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
 334
 335        git ls-files --stage >failedmerge &&
 336        cp file3 file3.conflict &&
 337
 338        git ls-files -u >actual &&
 339        test_cmp expected.unresolved actual
 340'
 341
 342test_expect_success 'explicit rerere' '
 343        test_might_fail git config --unset rerere.autoupdate &&
 344        git rm -fr --cached . &&
 345        git update-index --index-info <failedmerge &&
 346        cp file3.conflict file3 &&
 347        test_must_fail git update-index --refresh -q &&
 348
 349        git rerere &&
 350        git ls-files -u >actual &&
 351        test_cmp expected.unresolved actual
 352'
 353
 354test_expect_success 'explicit rerere with autoupdate' '
 355        git config rerere.autoupdate true &&
 356        git rm -fr --cached . &&
 357        git update-index --index-info <failedmerge &&
 358        cp file3.conflict file3 &&
 359        test_must_fail git update-index --refresh -q &&
 360
 361        git rerere &&
 362        git update-index --refresh
 363'
 364
 365test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
 366        git config rerere.autoupdate false &&
 367        git rm -fr --cached . &&
 368        git update-index --index-info <failedmerge &&
 369        cp file3.conflict file3 &&
 370        git rerere &&
 371        git ls-files -u >actual1 &&
 372
 373        git rm -fr --cached . &&
 374        git update-index --index-info <failedmerge &&
 375        cp file3.conflict file3 &&
 376        git rerere --rerere-autoupdate &&
 377        git update-index --refresh &&
 378
 379        git rm -fr --cached . &&
 380        git update-index --index-info <failedmerge &&
 381        cp file3.conflict file3 &&
 382        git rerere --rerere-autoupdate --no-rerere-autoupdate &&
 383        git ls-files -u >actual2 &&
 384
 385        git rm -fr --cached . &&
 386        git update-index --index-info <failedmerge &&
 387        cp file3.conflict file3 &&
 388        git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
 389        git update-index --refresh &&
 390
 391        test_cmp expected.unresolved actual1 &&
 392        test_cmp expected.unresolved actual2
 393'
 394
 395test_expect_success 'rerere --no-no-rerere-autoupdate' '
 396        git rm -fr --cached . &&
 397        git update-index --index-info <failedmerge &&
 398        cp file3.conflict file3 &&
 399        test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
 400        test_i18ngrep [Uu]sage err &&
 401        test_must_fail git update-index --refresh
 402'
 403
 404test_expect_success 'rerere -h' '
 405        test_must_fail git rerere -h >help &&
 406        test_i18ngrep [Uu]sage help
 407'
 408
 409concat_insert () {
 410        last=$1
 411        shift
 412        cat early && printf "%s\n" "$@" && cat late "$last"
 413}
 414
 415count_pre_post () {
 416        find .git/rr-cache/ -type f -name "preimage*" >actual &&
 417        test_line_count = "$1" actual &&
 418        find .git/rr-cache/ -type f -name "postimage*" >actual &&
 419        test_line_count = "$2" actual
 420}
 421
 422test_expect_success 'rerere gc' '
 423        find .git/rr-cache -type f >original &&
 424        xargs test-chmtime -172800 <original &&
 425
 426        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 427        find .git/rr-cache -type f >actual &&
 428        test_cmp original actual &&
 429
 430        git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
 431        find .git/rr-cache -type f >actual &&
 432        test_cmp original actual &&
 433
 434        git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
 435        find .git/rr-cache -type f >actual &&
 436        >expect &&
 437        test_cmp expect actual
 438'
 439
 440merge_conflict_resolve () {
 441        git reset --hard &&
 442        test_must_fail git merge six.1 &&
 443        # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
 444        concat_insert short 6.1 6.2 >file1 &&
 445        concat_insert long 6.1 6.2 >file2
 446}
 447
 448test_expect_success 'multiple identical conflicts' '
 449        git reset --hard &&
 450
 451        test_seq 1 6 >early &&
 452        >late &&
 453        test_seq 11 15 >short &&
 454        test_seq 111 120 >long &&
 455        concat_insert short >file1 &&
 456        concat_insert long >file2 &&
 457        git add file1 file2 &&
 458        git commit -m base &&
 459        git tag base &&
 460        git checkout -b six.1 &&
 461        concat_insert short 6.1 >file1 &&
 462        concat_insert long 6.1 >file2 &&
 463        git add file1 file2 &&
 464        git commit -m 6.1 &&
 465        git checkout -b six.2 HEAD^ &&
 466        concat_insert short 6.2 >file1 &&
 467        concat_insert long 6.2 >file2 &&
 468        git add file1 file2 &&
 469        git commit -m 6.2 &&
 470
 471        # At this point, six.1 and six.2
 472        # - derive from common ancestor that has two files
 473        #   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
 474        # - six.1 replaces these 7s with 6.1
 475        # - six.2 replaces these 7s with 6.2
 476
 477        merge_conflict_resolve &&
 478
 479        # Check that rerere knows that file1 and file2 have conflicts
 480
 481        printf "%s\n" file1 file2 >expect &&
 482        git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
 483        test_cmp expect actual &&
 484
 485        git rerere status | sort >actual &&
 486        test_cmp expect actual &&
 487
 488        git rerere remaining >actual &&
 489        test_cmp expect actual &&
 490
 491        count_pre_post 2 0 &&
 492
 493        # Pretend that the conflicts were made quite some time ago
 494        find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
 495
 496        # Unresolved entries have not expired yet
 497        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 498        count_pre_post 2 0 &&
 499
 500        # Unresolved entries have expired
 501        git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
 502        count_pre_post 0 0 &&
 503
 504        # Recreate the conflicted state
 505        merge_conflict_resolve &&
 506        count_pre_post 2 0 &&
 507
 508        # Clear it
 509        git rerere clear &&
 510        count_pre_post 0 0 &&
 511
 512        # Recreate the conflicted state
 513        merge_conflict_resolve &&
 514        count_pre_post 2 0 &&
 515
 516        # We resolved file1 and file2
 517        git rerere &&
 518        >expect &&
 519        git rerere remaining >actual &&
 520        test_cmp expect actual &&
 521
 522        # We must have recorded both of them
 523        count_pre_post 2 2 &&
 524
 525        # Now we should be able to resolve them both
 526        git reset --hard &&
 527        test_must_fail git merge six.1 &&
 528        git rerere &&
 529
 530        >expect &&
 531        git rerere remaining >actual &&
 532        test_cmp expect actual &&
 533
 534        concat_insert short 6.1 6.2 >file1.expect &&
 535        concat_insert long 6.1 6.2 >file2.expect &&
 536        test_cmp file1.expect file1 &&
 537        test_cmp file2.expect file2 &&
 538
 539        # Forget resolution for file2
 540        git rerere forget file2 &&
 541        echo file2 >expect &&
 542        git rerere status >actual &&
 543        test_cmp expect actual &&
 544        count_pre_post 2 1 &&
 545
 546        # file2 already has correct resolution, so record it again
 547        git rerere &&
 548
 549        # Pretend that the resolutions are old again
 550        find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
 551
 552        # Resolved entries have not expired yet
 553        git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
 554
 555        count_pre_post 2 2 &&
 556
 557        # Resolved entries have expired
 558        git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
 559        count_pre_post 0 0
 560'
 561
 562test_done