Andrew's git - gitweb.git/blob

aa4674f1df3793b4e5521e2a2b9a7d6e7d414896
   1#!/bin/sh
   2
   3test_description='--ancestry-path'
   4
   5#          D---E-------F
   6#         /     \       \
   7#    B---C---G---H---I---J
   8#   /                     \
   9#  A-------K---------------L--M
  10#
  11#  D..M                 == E F G H I J K L M
  12#  --ancestry-path D..M == E F H I J L M
  13#
  14#  D..M -- M.t                 == M
  15#  --ancestry-path D..M -- M.t == M
  16
  17. ./test-lib.sh
  18
  19test_merge () {
  20        test_tick &&
  21        git merge -s ours -m "$2" "$1" &&
  22        git tag "$2"
  23}
  24
  25test_expect_success setup '
  26        test_commit A &&
  27        test_commit B &&
  28        test_commit C &&
  29        test_commit D &&
  30        test_commit E &&
  31        test_commit F &&
  32        git reset --hard C &&
  33        test_commit G &&
  34        test_merge E H &&
  35        test_commit I &&
  36        test_merge F J &&
  37        git reset --hard A &&
  38        test_commit K &&
  39        test_merge J L &&
  40        test_commit M
  41'
  42
  43test_expect_success 'rev-list D..M' '
  44        for c in E F G H I J K L M; do echo $c; done >expect &&
  45        git rev-list --format=%s D..M |
  46        sed -e "/^commit /d" |
  47        sort >actual &&
  48        test_cmp expect actual
  49'
  50
  51test_expect_success 'rev-list --ancestry-path D..M' '
  52        for c in E F H I J L M; do echo $c; done >expect &&
  53        git rev-list --ancestry-path --format=%s D..M |
  54        sed -e "/^commit /d" |
  55        sort >actual &&
  56        test_cmp expect actual
  57'
  58
  59test_expect_success 'rev-list D..M -- M.t' '
  60        echo M >expect &&
  61        git rev-list --format=%s D..M -- M.t |
  62        sed -e "/^commit /d" >actual &&
  63        test_cmp expect actual
  64'
  65
  66test_expect_success 'rev-list --ancestry-patch D..M -- M.t' '
  67        echo M >expect &&
  68        git rev-list --ancestry-path --format=%s D..M -- M.t |
  69        sed -e "/^commit /d" >actual &&
  70        test_cmp expect actual
  71'
  72
  73#   b---bc
  74#  / \ /
  75# a   X
  76#  \ / \
  77#   c---cb
  78test_expect_success 'setup criss-cross' '
  79        mkdir criss-cross &&
  80        (cd criss-cross &&
  81         git init &&
  82         test_commit A &&
  83         git checkout -b b master &&
  84         test_commit B &&
  85         git checkout -b c master &&
  86         test_commit C &&
  87         git checkout -b bc b -- &&
  88         git merge c &&
  89         git checkout -b cb c -- &&
  90         git merge b &&
  91         git checkout master)
  92'
  93
  94# no commits in bc descend from cb
  95test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
  96        (cd criss-cross &&
  97         git rev-list --ancestry-path cb..bc > actual &&
  98         test -z "$(cat actual)")
  99'
 100
 101# no commits in repository descend from cb
 102test_expect_failure 'criss-cross: rev-list --ancestry-path --all ^cb' '
 103        (cd criss-cross &&
 104         git rev-list --ancestry-path --all ^cb > actual &&
 105         test -z "$(cat actual)")
 106'
 107
 108test_done