rebase: one safety net, one bugfix and one optimization.
[git.git] / t / t6010-merge-base.sh
blobc3a9680e2efe632f6e7cc46c828a393eef959d44
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='Merge base computation.
9 . ./test-lib.sh
11 T=$(git-write-tree)
13 M=1130000000
14 Z=+0000
16 export GIT_COMMITTER_EMAIL=git@comm.iter.xz
17 export GIT_COMMITTER_NAME='C O Mmiter'
18 export GIT_AUTHOR_NAME='A U Thor'
19 export GIT_AUTHOR_EMAIL=git@au.thor.xz
21 doit() {
22 OFFSET=$1; shift
23 NAME=$1; shift
24 PARENTS=
25 for P
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
37 # Setup...
38 E=$(doit 5 E)
39 D=$(doit 4 D $E)
40 F=$(doit 6 F $E)
41 C=$(doit 3 C $D)
42 B=$(doit 2 B $C)
43 A=$(doit 1 A $B)
44 G=$(doit 7 G $B $E)
45 H=$(doit 8 H $A $F)
47 test_expect_success 'compute merge-base (single)' \
48 'MB=$(git-merge-base G H) &&
49 expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
51 test_expect_success 'compute merge-base (all)' \
52 'MB=$(git-merge-base --all G H) &&
53 expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
55 test_expect_success 'compute merge-base with show-branch' \
56 'MB=$(git-show-branch --merge-base G H) &&
57 expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
59 test_done