Andrew's git - gitweb.git/blob - t/t6010-merge-base.sh

   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
  11T=$(git-write-tree)
  12
  13M=1130000000
  14Z=+0000
  15
  16export GIT_COMMITTER_EMAIL=git@comm.iter.xz
  17export GIT_COMMITTER_NAME='C O Mmiter'
  18export GIT_AUTHOR_NAME='A U Thor'
  19export GIT_AUTHOR_EMAIL=git@au.thor.xz
  20
  21doit() {
  22        OFFSET=$1; shift
  23        NAME=$1; shift
  24        PARENTS=
  25        for P
  26        do
  27                PARENTS="${PARENTS}-p $P "
  28        done
  29        GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z"
  30        GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE
  31        export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
  32        commit=$(echo $NAME | git-commit-tree $T $PARENTS)
  33        echo $commit >.git/refs/tags/$NAME
  34        echo $commit
  35}
  36
  37# Setup...
  38E=$(doit 5 E)
  39D=$(doit 4 D $E)
  40F=$(doit 6 F $E)
  41C=$(doit 3 C $D)
  42B=$(doit 2 B $C)
  43A=$(doit 1 A $B)
  44G=$(doit 7 G $B $E)
  45H=$(doit 8 H $A $F)
  46
  47# Setup for second test to demonstrate that relying on timestamps in a
  48# distributed SCM to provide a _consistent_ partial ordering of commits
  49# leads to insanity.
  50#
  51#               Relative
  52# Structure     timestamps
  53#
  54#   PL  PR        +4  +4
  55#  /  \/  \      /  \/  \
  56# L2  C2  R2    +3  -1  +3
  57# |   |   |     |   |   |
  58# L1  C1  R1    +2  -2  +2
  59# |   |   |     |   |   |
  60# L0  C0  R0    +1  -3  +1
  61#   \ |  /        \ |  /
  62#     S             0
  63#
  64# The left and right chains of commits can be of any length and complexity as
  65# long as all of the timestamps are greater than that of S.
  66
  67S=$(doit  0 S)
  68
  69C0=$(doit -3 C0 $S)
  70C1=$(doit -2 C1 $C0)
  71C2=$(doit -1 C2 $C1)
  72
  73L0=$(doit  1 L0 $S)
  74L1=$(doit  2 L1 $L0)
  75L2=$(doit  3 L2 $L1)
  76
  77R0=$(doit  1 R0 $S)
  78R1=$(doit  2 R1 $R0)
  79R2=$(doit  3 R2 $R1)
  80
  81PL=$(doit  4 PL $L2 $C2)
  82PR=$(doit  4 PR $C2 $R2)
  83
  84test_expect_success 'compute merge-base (single)' \
  85    'MB=$(git-merge-base G H) &&
  86     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
  87
  88test_expect_success 'compute merge-base (all)' \
  89    'MB=$(git-merge-base --all G H) &&
  90     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
  91
  92test_expect_success 'compute merge-base with show-branch' \
  93    'MB=$(git-show-branch --merge-base G H) &&
  94     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
  95
  96test_expect_success 'compute merge-base (single)' \
  97    'MB=$(git-merge-base PL PR) &&
  98     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/C2"'
  99
 100test_expect_success 'compute merge-base (all)' \
 101    'MB=$(git-merge-base --all PL PR) &&
 102     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/C2"'
 103
 104test_done