rebase: use correct base for --keep-base when a branch is given
[alt-git.git] / t / t6009-rev-list-parent.sh
blob5a67bbc760fdc8c2b53dc7721a144e033bf8e934
1 #!/bin/sh
3 test_description='ancestor culling and limiting by parent number'
5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
8 . ./test-lib.sh
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
18 test_expect_success setup '
20 touch file &&
21 git add file &&
23 test_commit one &&
25 test_tick=$(($test_tick - 2400)) &&
27 test_commit two &&
28 test_commit three &&
29 test_commit four &&
31 git log --pretty=oneline --abbrev-commit
34 test_expect_success 'one is ancestor of others and should not be shown' '
36 git rev-list one --not four >result &&
37 test_must_be_empty result
41 test_expect_success 'setup roots, merges and octopuses' '
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 &&
51 git checkout main &&
52 test_tick &&
53 git merge --allow-unrelated-histories -m normalmerge newroot &&
54 git tag normalmerge &&
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 &&
62 git checkout main
65 test_expect_success 'rev-list roots' '
67 check_revlist "--max-parents=0" one five
70 test_expect_success 'rev-list no merges' '
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
76 test_expect_success 'rev-list no octopuses' '
78 check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
81 test_expect_success 'rev-list no roots' '
83 check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
86 test_expect_success 'rev-list merges' '
88 check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
89 check_revlist "--merges" tetrapus tripus normalmerge
92 test_expect_success 'rev-list octopus' '
94 check_revlist "--min-parents=3" tetrapus tripus
97 test_expect_success 'rev-list ordinary commits' '
99 check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
102 test_expect_success 'rev-list --merges --no-merges yields empty set' '
104 check_revlist "--min-parents=2 --no-merges" &&
105 check_revlist "--merges --no-merges" &&
106 check_revlist "--no-merges --merges"
109 test_expect_success 'rev-list override and infinities' '
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
119 test_expect_success 'dodecapus' '
121 roots= &&
122 for i in 1 2 3 4 5 6 7 8 9 10 11
124 git checkout -b root$i five &&
125 test_commit $i &&
126 roots="$roots root$i" ||
127 return 1
128 done &&
129 git checkout main &&
130 test_tick &&
131 git merge -m dodecapus $roots &&
132 git tag dodecapus &&
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
141 test_expect_success 'ancestors with the same commit time' '
143 test_tick_keep=$test_tick &&
144 for i in 1 2 3 4 5 6 7 8; do
145 test_tick=$test_tick_keep &&
146 test_commit t$i || return 1
147 done &&
148 git rev-list t1^! --not t$i >result &&
149 test_must_be_empty result
152 test_done