Andrew's git / gitweb.git /
001431b36310813e0cd75d9aac364d72c8d0673d
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Merge base computation.
   7'
   8
   9. ./test-lib.sh
  10
  11test_expect_success 'setup' '
  12        T=$(git write-tree) &&
  13
  14        M=1130000000 &&
  15        Z=+0000 &&
  16
  17        GIT_COMMITTER_EMAIL=git@comm.iter.xz &&
  18        GIT_COMMITTER_NAME="C O Mmiter" &&
  19        GIT_AUTHOR_NAME="A U Thor" &&
  20        GIT_AUTHOR_EMAIL=git@au.thor.xz &&
  21        export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
  22
  23        doit() {
  24                OFFSET=$1 &&
  25                NAME=$2 &&
  26                shift 2 &&
  27
  28                PARENTS= &&
  29                for P
  30                do
  31                        PARENTS="${PARENTS}-p $P "
  32                done &&
  33
  34                GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z" &&
  35                GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE &&
  36                export GIT_COMMITTER_DATE GIT_AUTHOR_DATE &&
  37
  38                commit=$(echo $NAME | git commit-tree $T $PARENTS) &&
  39
  40                echo $commit >.git/refs/tags/$NAME &&
  41                echo $commit
  42        }
  43'
  44
  45test_expect_success 'set up G and H' '
  46        # E---D---C---B---A
  47        # \"-_         \   \
  48        #  \  `---------G   \
  49        #   \                \
  50        #    F----------------H
  51        E=$(doit 5 E) &&
  52        D=$(doit 4 D $E) &&
  53        F=$(doit 6 F $E) &&
  54        C=$(doit 3 C $D) &&
  55        B=$(doit 2 B $C) &&
  56        A=$(doit 1 A $B) &&
  57        G=$(doit 7 G $B $E) &&
  58        H=$(doit 8 H $A $F)
  59'
  60
  61test_expect_success 'merge-base G H' '
  62        git name-rev $B >expected &&
  63
  64        MB=$(git merge-base G H) &&
  65        git name-rev "$MB" >actual.single &&
  66
  67        MB=$(git merge-base --all G H) &&
  68        git name-rev "$MB" >actual.all &&
  69
  70        MB=$(git show-branch --merge-base G H) &&
  71        git name-rev "$MB" >actual.sb &&
  72
  73        test_cmp expected actual.single &&
  74        test_cmp expected actual.all &&
  75        test_cmp expected actual.sb
  76'
  77
  78test_expect_success 'unsynchronized clocks' '
  79        # This test is to demonstrate that relying on timestamps in a distributed
  80        # SCM to provide a _consistent_ partial ordering of commits leads to
  81        # insanity.
  82        #
  83        #               Relative
  84        # Structure     timestamps
  85        #
  86        #   PL  PR        +4  +4
  87        #  /  \/  \      /  \/  \
  88        # L2  C2  R2    +3  -1  +3
  89        # |   |   |     |   |   |
  90        # L1  C1  R1    +2  -2  +2
  91        # |   |   |     |   |   |
  92        # L0  C0  R0    +1  -3  +1
  93        #   \ |  /        \ |  /
  94        #     S             0
  95        #
  96        # The left and right chains of commits can be of any length and complexity as
  97        # long as all of the timestamps are greater than that of S.
  98
  99        S=$(doit  0 S) &&
 100
 101        C0=$(doit -3 C0 $S) &&
 102        C1=$(doit -2 C1 $C0) &&
 103        C2=$(doit -1 C2 $C1) &&
 104
 105        L0=$(doit  1 L0 $S) &&
 106        L1=$(doit  2 L1 $L0) &&
 107        L2=$(doit  3 L2 $L1) &&
 108
 109        R0=$(doit  1 R0 $S) &&
 110        R1=$(doit  2 R1 $R0) &&
 111        R2=$(doit  3 R2 $R1) &&
 112
 113        PL=$(doit  4 PL $L2 $C2) &&
 114        PR=$(doit  4 PR $C2 $R2)
 115
 116        git name-rev $C2 >expected &&
 117
 118        MB=$(git merge-base PL PR) &&
 119        git name-rev "$MB" >actual.single &&
 120
 121        MB=$(git merge-base --all PL PR) &&
 122        git name-rev "$MB" >actual.all &&
 123
 124        test_cmp expected actual.single &&
 125        test_cmp expected actual.all
 126'
 127
 128test_expect_success 'merge-base for octopus-step (setup)' '
 129        # Another set to demonstrate base between one commit and a merge
 130        # in the documentation.
 131        #
 132        # * C (MMC) * B (MMB) * A  (MMA)
 133        # * o       * o       * o
 134        # * o       * o       * o
 135        # * o       * o       * o
 136        # * o       | _______/
 137        # |         |/
 138        # |         * 1 (MM1)
 139        # | _______/
 140        # |/
 141        # * root (MMR)
 142
 143        test_commit MMR &&
 144        test_commit MM1 &&
 145        test_commit MM-o &&
 146        test_commit MM-p &&
 147        test_commit MM-q &&
 148        test_commit MMA &&
 149        git checkout MM1 &&
 150        test_commit MM-r &&
 151        test_commit MM-s &&
 152        test_commit MM-t &&
 153        test_commit MMB &&
 154        git checkout MMR &&
 155        test_commit MM-u &&
 156        test_commit MM-v &&
 157        test_commit MM-w &&
 158        test_commit MM-x &&
 159        test_commit MMC
 160'
 161
 162test_expect_success 'merge-base A B C' '
 163        git rev-parse --verify MM1 >expected &&
 164        git rev-parse --verify MMR >expected.sb &&
 165
 166        git merge-base --all MMA MMB MMC >actual &&
 167        git merge-base --all --octopus MMA MMB MMC >actual.common &&
 168        git show-branch --merge-base MMA MMB MMC >actual.sb &&
 169
 170        test_cmp expected actual &&
 171        test_cmp expected.sb actual.common &&
 172        test_cmp expected.sb actual.sb
 173'
 174
 175test_expect_success 'criss-cross merge-base for octopus-step' '
 176        git reset --hard MMR &&
 177        test_commit CC1 &&
 178        git reset --hard E &&
 179        test_commit CC2 &&
 180        test_tick &&
 181        git merge -s ours CC1 &&
 182        test_commit CC-o &&
 183        test_commit CCB &&
 184        git reset --hard CC1 &&
 185        git merge -s ours CC2 &&
 186        test_commit CCA &&
 187
 188        git rev-parse CC1 CC2 >expected &&
 189        git merge-base --all CCB CCA^^ CCA^^2 >actual &&
 190
 191        sort expected >expected.sorted &&
 192        sort actual >actual.sorted &&
 193        test_cmp expected.sorted actual.sorted
 194'
 195
 196test_done