diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:36 -0800 |
| commit | 3b9d69ec22b8821fecc44c07ea49adc749484335 (patch) | |
| tree | 89993616989d8d5a43cbcf5a39ac651c70a2272f /t/t6101-rev-parse-parents.sh | |
| parent | Merge branch 'jk/test-framework-updates' (diff) | |
| parent | Remove the line length limit for graft files (diff) | |
| download | tgif-3b9d69ec22b8821fecc44c07ea49adc749484335.tar.xz | |
Merge branch 'js/lift-parent-count-limit'
There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism.
* js/lift-parent-count-limit:
Remove the line length limit for graft files
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
| -rwxr-xr-x | t/t6101-rev-parse-parents.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index 7ea14ced31..10b1452766 100755 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -20,7 +20,17 @@ test_expect_success 'setup' ' test_commit start2 && git checkout master && git merge -m next start2 && - test_commit final + test_commit final && + + test_seq 40 | + while read i + do + git checkout --orphan "b$i" && + test_tick && + git commit --allow-empty -m "$i" && + commit=$(git rev-parse --verify HEAD) && + printf "$commit " >>.git/info/grafts + done ' test_expect_success 'start is valid' ' @@ -79,6 +89,10 @@ test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' ' test_cmp expect actual ' +test_expect_success 'large graft octopus' ' + test_cmp_rev_output b31 "git rev-parse --verify b1^30" +' + test_expect_success 'repack for next test' ' git repack -a -d ' |