3 test_description='--ancestry-path'
7 # B---C---G---H---I---J
9 # A-------K---------------L--M
11 # D..M == E F G H I J K L M
12 # --ancestry-path D..M == E F H I J L M
15 # --ancestry-path D..M -- M.t == M
21 git merge -s ours -m "$2" "$1" &&
25 test_expect_success setup '
43 test_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" |
48 test_cmp expect actual
51 test_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" |
56 test_cmp expect actual
59 test_expect_success 'rev-list D..M -- M.t' '
61 git rev-list --format=%s D..M -- M.t |
62 sed -e "/^commit /d" >actual &&
63 test_cmp expect actual
66 test_expect_success 'rev-list --ancestry-patch D..M -- M.t' '
68 git rev-list --ancestry-path --format=%s D..M -- M.t |
69 sed -e "/^commit /d" >actual &&
70 test_cmp expect actual