Merge branch 'ks/recursive-rename-add-identical'
[git/kirr.git] / t / t6019-rev-list-ancestry-path.sh
blob76410293b34ecede219445e09b1eccb8175ee115
1 #!/bin/sh
3 test_description='--ancestry-path'
5 # D---E-------F
6 # / \ \
7 # B---C---G---H---I---J
8 # / \
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
14 # D..M -- M.t == M
15 # --ancestry-path D..M -- M.t == M
17 . ./test-lib.sh
19 test_merge () {
20 test_tick &&
21 git merge -s ours -m "$2" "$1" &&
22 git tag "$2"
25 test_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
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" |
47 sort >actual &&
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" |
55 sort >actual &&
56 test_cmp expect actual
59 test_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
66 test_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
73 test_done