]>
Commit | Line | Data |
---|---|---|
991c3dc7 JH |
1 | #!/bin/sh |
2 | ||
6a6ebded | 3 | test_description='ancestor culling and limiting by parent number' |
991c3dc7 | 4 | |
1550bb6e | 5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
334afbc7 JS |
6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
7 | ||
991c3dc7 JH |
8 | . ./test-lib.sh |
9 | ||
6a6ebded MG |
10 | check_revlist () { |
11 | rev_list_args="$1" && | |
12 | shift && | |
13 | git rev-parse "$@" >expect && | |
14 | git rev-list $rev_list_args --all >actual && | |
15 | test_cmp expect actual | |
16 | } | |
17 | ||
991c3dc7 JH |
18 | test_expect_success setup ' |
19 | ||
20 | touch file && | |
21 | git add file && | |
22 | ||
8ee50594 | 23 | test_commit one && |
991c3dc7 | 24 | |
a48fcd83 | 25 | test_tick=$(($test_tick - 2400)) && |
991c3dc7 | 26 | |
8ee50594 MG |
27 | test_commit two && |
28 | test_commit three && | |
29 | test_commit four && | |
991c3dc7 JH |
30 | |
31 | git log --pretty=oneline --abbrev-commit | |
32 | ' | |
33 | ||
7d004199 | 34 | test_expect_success 'one is ancestor of others and should not be shown' ' |
991c3dc7 JH |
35 | |
36 | git rev-list one --not four >result && | |
d3c6751b | 37 | test_must_be_empty result |
991c3dc7 JH |
38 | |
39 | ' | |
40 | ||
6a6ebded MG |
41 | test_expect_success 'setup roots, merges and octopuses' ' |
42 | ||
43 | git checkout --orphan newroot && | |
44 | test_commit five && | |
45 | git checkout -b sidebranch two && | |
46 | test_commit six && | |
47 | git checkout -b anotherbranch three && | |
48 | test_commit seven && | |
49 | git checkout -b yetanotherbranch four && | |
50 | test_commit eight && | |
1550bb6e | 51 | git checkout main && |
e379fdf3 JH |
52 | test_tick && |
53 | git merge --allow-unrelated-histories -m normalmerge newroot && | |
54 | git tag normalmerge && | |
6a6ebded MG |
55 | test_tick && |
56 | git merge -m tripus sidebranch anotherbranch && | |
57 | git tag tripus && | |
58 | git checkout -b tetrabranch normalmerge && | |
59 | test_tick && | |
60 | git merge -m tetrapus sidebranch anotherbranch yetanotherbranch && | |
61 | git tag tetrapus && | |
1550bb6e | 62 | git checkout main |
6a6ebded MG |
63 | ' |
64 | ||
65 | test_expect_success 'rev-list roots' ' | |
66 | ||
67 | check_revlist "--max-parents=0" one five | |
68 | ' | |
69 | ||
70 | test_expect_success 'rev-list no merges' ' | |
71 | ||
72 | check_revlist "--max-parents=1" one eight seven six five four three two && | |
73 | check_revlist "--no-merges" one eight seven six five four three two | |
74 | ' | |
75 | ||
76 | test_expect_success 'rev-list no octopuses' ' | |
77 | ||
78 | check_revlist "--max-parents=2" one normalmerge eight seven six five four three two | |
79 | ' | |
80 | ||
81 | test_expect_success 'rev-list no roots' ' | |
82 | ||
83 | check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two | |
84 | ' | |
85 | ||
86 | test_expect_success 'rev-list merges' ' | |
87 | ||
88 | check_revlist "--min-parents=2" tetrapus tripus normalmerge && | |
89 | check_revlist "--merges" tetrapus tripus normalmerge | |
90 | ' | |
91 | ||
92 | test_expect_success 'rev-list octopus' ' | |
93 | ||
94 | check_revlist "--min-parents=3" tetrapus tripus | |
95 | ' | |
96 | ||
97 | test_expect_success 'rev-list ordinary commits' ' | |
98 | ||
99 | check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two | |
100 | ' | |
101 | ||
102 | test_expect_success 'rev-list --merges --no-merges yields empty set' ' | |
103 | ||
104 | check_revlist "--min-parents=2 --no-merges" && | |
105 | check_revlist "--merges --no-merges" && | |
106 | check_revlist "--no-merges --merges" | |
107 | ' | |
108 | ||
109 | test_expect_success 'rev-list override and infinities' ' | |
110 | ||
111 | check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge && | |
112 | check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge && | |
113 | check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge && | |
114 | check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge && | |
115 | check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge && | |
116 | check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five | |
117 | ' | |
118 | ||
482ce70e | 119 | test_expect_success 'dodecapus' ' |
6a6ebded | 120 | |
482ce70e | 121 | roots= && |
6a6ebded MG |
122 | for i in 1 2 3 4 5 6 7 8 9 10 11 |
123 | do | |
482ce70e JN |
124 | git checkout -b root$i five && |
125 | test_commit $i && | |
126 | roots="$roots root$i" || | |
0c51d6b4 | 127 | return 1 |
6a6ebded | 128 | done && |
1550bb6e | 129 | git checkout main && |
6a6ebded | 130 | test_tick && |
482ce70e JN |
131 | git merge -m dodecapus $roots && |
132 | git tag dodecapus && | |
6a6ebded MG |
133 | |
134 | check_revlist "--min-parents=4" dodecapus tetrapus && | |
135 | check_revlist "--min-parents=8" dodecapus && | |
136 | check_revlist "--min-parents=12" dodecapus && | |
137 | check_revlist "--min-parents=13" && | |
138 | check_revlist "--min-parents=4 --max-parents=11" tetrapus | |
139 | ' | |
c19d1b4e KK |
140 | |
141 | test_expect_success 'ancestors with the same commit time' ' | |
142 | ||
143 | test_tick_keep=$test_tick && | |
144 | for i in 1 2 3 4 5 6 7 8; do | |
74d2f569 | 145 | test_tick=$test_tick_keep && |
0c51d6b4 | 146 | test_commit t$i || return 1 |
c19d1b4e KK |
147 | done && |
148 | git rev-list t1^! --not t$i >result && | |
d3c6751b | 149 | test_must_be_empty result |
c19d1b4e KK |
150 | ' |
151 | ||
991c3dc7 | 152 | test_done |