Andrew's git - gitweb.git/blob - t/t6019-rev-list-ancestry-path.sh

   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#  F...I                 == F G H I
  18#  --ancestry-path F...I == F H I
  19#
  20#  G..M -- G.t                 == [nothing - was dropped in "-s ours" merge L]
  21#  --ancestry-path G..M -- G.t == L
  22#  --ancestry-path --simplify-merges G^..M -- G.t == G L
  23
  24. ./test-lib.sh
  25
  26test_merge () {
  27        test_tick &&
  28        git merge -s ours -m "$2" "$1" &&
  29        git tag "$2"
  30}
  31
  32test_expect_success setup '
  33        test_commit A &&
  34        test_commit B &&
  35        test_commit C &&
  36        test_commit D &&
  37        test_commit E &&
  38        test_commit F &&
  39        git reset --hard C &&
  40        test_commit G &&
  41        test_merge E H &&
  42        test_commit I &&
  43        test_merge F J &&
  44        git reset --hard A &&
  45        test_commit K &&
  46        test_merge J L &&
  47        test_commit M
  48'
  49
  50test_expect_success 'rev-list D..M' '
  51        for c in E F G H I J K L M; do echo $c; done >expect &&
  52        git rev-list --format=%s D..M |
  53        sed -e "/^commit /d" |
  54        sort >actual &&
  55        test_cmp expect actual
  56'
  57
  58test_expect_success 'rev-list --ancestry-path D..M' '
  59        for c in E F H I J L M; do echo $c; done >expect &&
  60        git rev-list --ancestry-path --format=%s D..M |
  61        sed -e "/^commit /d" |
  62        sort >actual &&
  63        test_cmp expect actual
  64'
  65
  66test_expect_success 'rev-list D..M -- M.t' '
  67        echo M >expect &&
  68        git rev-list --format=%s D..M -- M.t |
  69        sed -e "/^commit /d" >actual &&
  70        test_cmp expect actual
  71'
  72
  73test_expect_success 'rev-list --ancestry-path D..M -- M.t' '
  74        echo M >expect &&
  75        git rev-list --ancestry-path --format=%s D..M -- M.t |
  76        sed -e "/^commit /d" >actual &&
  77        test_cmp expect actual
  78'
  79
  80test_expect_success 'rev-list F...I' '
  81        for c in F G H I; do echo $c; done >expect &&
  82        git rev-list --format=%s F...I |
  83        sed -e "/^commit /d" |
  84        sort >actual &&
  85        test_cmp expect actual
  86'
  87
  88test_expect_success 'rev-list --ancestry-path F...I' '
  89        for c in F H I; do echo $c; done >expect &&
  90        git rev-list --ancestry-path --format=%s F...I |
  91        sed -e "/^commit /d" |
  92        sort >actual &&
  93        test_cmp expect actual
  94'
  95
  96# G.t is dropped in an "-s ours" merge
  97test_expect_success 'rev-list G..M -- G.t' '
  98        >expect &&
  99        git rev-list --format=%s G..M -- G.t |
 100        sed -e "/^commit /d" >actual &&
 101        test_cmp expect actual
 102'
 103
 104test_expect_success 'rev-list --ancestry-path G..M -- G.t' '
 105        echo L >expect &&
 106        git rev-list --ancestry-path --format=%s G..M -- G.t |
 107        sed -e "/^commit /d" >actual &&
 108        test_cmp expect actual
 109'
 110
 111test_expect_success 'rev-list --ancestry-path --simplify-merges G^..M -- G.t' '
 112        for c in G L; do echo $c; done >expect &&
 113        git rev-list --ancestry-path --simplify-merges --format=%s G^..M -- G.t |
 114        sed -e "/^commit /d" |
 115        sort >actual &&
 116        test_cmp expect actual
 117'
 118
 119#   b---bc
 120#  / \ /
 121# a   X
 122#  \ / \
 123#   c---cb
 124#
 125# All refnames prefixed with 'x' to avoid confusion with the tags
 126# generated by test_commit on case-insensitive systems.
 127test_expect_success 'setup criss-cross' '
 128        mkdir criss-cross &&
 129        (cd criss-cross &&
 130         git init &&
 131         test_commit A &&
 132         git checkout -b xb master &&
 133         test_commit B &&
 134         git checkout -b xc master &&
 135         test_commit C &&
 136         git checkout -b xbc xb -- &&
 137         git merge xc &&
 138         git checkout -b xcb xc -- &&
 139         git merge xb &&
 140         git checkout master)
 141'
 142
 143# no commits in bc descend from cb
 144test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
 145        (cd criss-cross &&
 146         git rev-list --ancestry-path xcb..xbc > actual &&
 147         test -z "$(cat actual)")
 148'
 149
 150# no commits in repository descend from cb
 151test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
 152        (cd criss-cross &&
 153         git rev-list --ancestry-path --all ^xcb > actual &&
 154         test -z "$(cat actual)")
 155'
 156
 157test_done