merge-recursive: don't detect renames of empty files
[git/jnareb-git.git] / t / t6009-rev-list-parent.sh
blob30507407ff6375f96c632c7c3f62ae3d338ed5ea
1 #!/bin/sh
3 test_description='ancestor culling and limiting by parent number'
5 . ./test-lib.sh
7 check_revlist () {
8 rev_list_args="$1" &&
9 shift &&
10 git rev-parse "$@" >expect &&
11 git rev-list $rev_list_args --all >actual &&
12 test_cmp expect actual
15 test_expect_success setup '
17 touch file &&
18 git add file &&
20 test_commit one &&
22 test_tick=$(($test_tick - 2400)) &&
24 test_commit two &&
25 test_commit three &&
26 test_commit four &&
28 git log --pretty=oneline --abbrev-commit
31 test_expect_success 'one is ancestor of others and should not be shown' '
33 git rev-list one --not four >result &&
34 >expect &&
35 test_cmp expect result
39 test_expect_success 'setup roots, merges and octopuses' '
41 git checkout --orphan newroot &&
42 test_commit five &&
43 git checkout -b sidebranch two &&
44 test_commit six &&
45 git checkout -b anotherbranch three &&
46 test_commit seven &&
47 git checkout -b yetanotherbranch four &&
48 test_commit eight &&
49 git checkout master &&
50 test_merge normalmerge newroot &&
51 test_tick &&
52 git merge -m tripus sidebranch anotherbranch &&
53 git tag tripus &&
54 git checkout -b tetrabranch normalmerge &&
55 test_tick &&
56 git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
57 git tag tetrapus &&
58 git checkout master
61 test_expect_success 'rev-list roots' '
63 check_revlist "--max-parents=0" one five
66 test_expect_success 'rev-list no merges' '
68 check_revlist "--max-parents=1" one eight seven six five four three two &&
69 check_revlist "--no-merges" one eight seven six five four three two
72 test_expect_success 'rev-list no octopuses' '
74 check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
77 test_expect_success 'rev-list no roots' '
79 check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
82 test_expect_success 'rev-list merges' '
84 check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
85 check_revlist "--merges" tetrapus tripus normalmerge
88 test_expect_success 'rev-list octopus' '
90 check_revlist "--min-parents=3" tetrapus tripus
93 test_expect_success 'rev-list ordinary commits' '
95 check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
98 test_expect_success 'rev-list --merges --no-merges yields empty set' '
100 check_revlist "--min-parents=2 --no-merges" &&
101 check_revlist "--merges --no-merges" &&
102 check_revlist "--no-merges --merges"
105 test_expect_success 'rev-list override and infinities' '
107 check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
108 check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
109 check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
110 check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
111 check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
112 check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
115 test_expect_success 'dodecapus' '
117 roots= &&
118 for i in 1 2 3 4 5 6 7 8 9 10 11
120 git checkout -b root$i five &&
121 test_commit $i &&
122 roots="$roots root$i" ||
123 return
124 done &&
125 git checkout master &&
126 test_tick &&
127 git merge -m dodecapus $roots &&
128 git tag dodecapus &&
130 check_revlist "--min-parents=4" dodecapus tetrapus &&
131 check_revlist "--min-parents=8" dodecapus &&
132 check_revlist "--min-parents=12" dodecapus &&
133 check_revlist "--min-parents=13" &&
134 check_revlist "--min-parents=4 --max-parents=11" tetrapus
136 test_done